Initialization fixes