More fixes for linux.