Latest changes & fixes for MZH