Fix some issues with MapGenerators and Case