A few small changes