Fixes for MVVM issues noted by Stefan

See PR #109