Put some startup fixes back
More startup improvements