Fixing some of the preflight issues that are occurring.