Some changes that I forgot to add to the previous push.