Fix the exports