Even more PyLint fixes