More PyLint fixes