Fix remaining pylint errors