Various fixes 4

In preparing for the webinar this Wednesday I'm sure I'll run into some bugs.  Collecting them here.
If its ok, I'm going to merge this and call this a separate issue.  I want to get this going through Jenkins very soon.