Windows compilation fixes
Windows compilation fixes

ds283/splinter,ds283/splinter,ds283/splinter,bgrimstad/splinter,bgrimstad/splinter,bgrimstad/splinter,ds283/splinter,ds283/splinter,bgrimstad/splinter,bgrimstad/splinter