dev: Fixes to export functions