Other changes were picked up by github late

Should have been attached to the previous commit