Fixed some model validation issues.