Additions to please pylint