Make additional glob6 to glob changes