Fixes for building setup files for windows