Tweak a few inconsequential things