A few small changes for consistency