Misc pylint fixes