2 fixes for bugs I introduced in recent new features

Note that this pull request seems to include 6 commits you already processed.  I'm not sure why.