Minor model and view changes