Rector fixes