Some commits that fix things up in Maze 2.