Fix some bugs I introduced.  Do an anti-rant