More changes to the whitelists, exports