Fixing new hosted checkout and COF.