Some pylint fixes