hdmz fixes