Tweak a couple bugs.