various fixes to get zone_domain migrations working