Further initialization fixes