Changes to avoid "pylint" complaints