Fix export functions