more fixes for linux