Some changes for Linux build