Added a few small changes