Update VS builds, make cast explicit.