Fixing all the exports