Tweaking the Linux changes so it don't break Windows version.