A few small changes that I forgot in the last revision