fixes JIRA issues

https://jira.oceanobservatories.org/tasks/browse/OOIION-1207
https://jira.oceanobservatories.org/tasks/browse/OOIION-1414