Rotor and RotorDeck fixes