Fixing compilation on CS linux machines