Exports clean-up

This PR tidies up a few things related to exports.