Windows fixes applied to Linux build fixes :)