Minor fixes for Linux version.