More error fixes

Errors fixed with flight mode terminate