Minor model changes