More tweaks to the hold check