fixes from UpdateHot4