MPV fixes