More MPV fixes