Additional map editor changes