Fixed some model issues.