Various startup fixes