Mode initialization fixes