Final preflight tweaks