Flight Spice IA code review changes (continued from #1187, #1268)