Fixes to MapEditor due to merge.