- more fixes for linux