Tweak a few small things