Fix some more pylint errors