Mezzanine update bug fixes