Description

Fixing more bugs from the static code analysis done with codex.

Checklist

I have checked that my code follows the Octopus coding standards
I have added tests for all the new features added in this request.