Some more initialisation changes