Fix regressions
Populate user instances in map editors with data
Fix numerous bugs