A few adjustments to please pylint