Some changes that missed my previous commit