[Integration] Fixing problems