Fix pylint-reported errors