Fixes for mvm