Assorted model changes.