Fixing NAMESPACE export functions