Unfolding pulls fixes