mav fixes