More fixes for linux