Fix SWE problems

Some small hiccups I ran into when working on some IOOS/SWE stuff.