Maze fixes