Fixing export functions.