Some refactoring work better on Linux envs.