Making a few small tweaks