Fix various bugs in flight configurations