Fix additional pylint notes