Air ops bug fixes, cleanup