A few more startup fixes.