minor tweaks to support closure changes