Updates for building in VS