MapEditor: Some fixes