Fixes for the curves on windows