More pylint releated fixes.