Fix for #7 and #8 to make sure each model object has the correct positional information to allow errors to be highlighted in the editor