Make a few small tweaks