Multiple bug fixes to last commit.  Oops.