Even more fixes

small fixes, biggest ones are airlock controllers