Fix import errors reported by pylint