more initialization fixes