Add a few small changes