Some changes that I forgot to commit