Fixes for linux version.