Controller departure fixes