Fixes for linux