fix model issues