Issue #2579: Fix release build in VS