Some minor fixes to get rid of warnings in mvm compile