more export fixes
more export fixes


Former-commit-id: 4ca7f1f81d51d7c094d904b6aa1e176cf5958630