Some changes I forgot to put in the last commit