More attempts at fixing ModelHelper stuff.