More fixes for Linux