Fix some more warnings
Description
Fix some more warnings plus a few bugs.
News snippet
Fix some more warnings plus a few bugs.
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.