Some changes that I forgot to push earlier.