Windows export fixes