Fixes to ModelHelper.java