fix failing mvm test and bogus focus issue