fix up export errors found with unittests.