Minor model fixes