Fixes to export and tasks.