Minor fixes on Linux version.