Fixes for Linux version.