Mvp fixups