Fixed associated model issues.