Fixes for monarch-app#358