Windows build fixes. Thanks Dan!