And more pylint fixes