More fixes for Linux build