Some changes missed in previous commit