Fixes for preflight