Updated scripts for vs to build correctly