fixes to nextaired