Add rest of offers fixes