Small changes that missed previous commit