fixes around MVP