Tweak a few things