Various fixes 4

In preparing for the webinar this Wednesday I'm sure I'll run into some bugs.  Collecting them here.
Fixed throughout all resource functions, except in cases where I didn't think it was appropriate.