More pylint fixes