Fix compilation problems
Fix issues with windows run'