Model fixes and changes.