Fix more problems found by pylint