Pylint: fixing a few of the remaining issues in master