Initialization fixes.