More build fixes to try to address windows build red.