Minor changes missed on previous commit