Some more closure changes