Bug fix and updates at export activities.