[Integration] Restore Eloy's fixes