Various fixes

I recently started using this plugin.  These are a few fixes for bugs I found.