Batched VS builds, updated libsodium imports