Make a few small changes