fix export-related issues (related to enhancement 972)