Fix issues on linux (due to previous commits on windows)