More Pilot Fixes