Fix accessors on models