Fix assembly merge
Fix flight json
Fix index out of range
Fix config