Fixed some model issues