Add fixes to pylint errors left over from refactoring