A few small changes...