Small initialization fixes