Fixes for map editor