Fixes for instance model and editor