Flight mode fixes