Windows deployment fixes around export data