Minor changes in the preflight impls