Fixes to consistency between model and view.