A few pylint fixes