Rogue class fixes