More fixes for Linux.