Fix some pylint errors on develop

There are some more pylint errors left-over from a merge-forward.
However, those will be cleaned up on the next merge-forward.