A couple changes I forgot to commit