Fixes for build on windows posible conflicting with linux-build