SES - could it be fuel pump?

[NittanyX5]

SES light came on about a month ago. Went to dealer last week. They kept it all week and replaced oxygen sensors and camshaft sensor. Service technician says all good. Drove away from the dealer, and 5 minutes later, the SES light is back on again .

Went to local Autozone to get a readout and they return codes 1158 (Fuel Trim Additve Bank 1 Low) and 1160 (Fuel Trim Additve Bank 2 Low). The X5 has shut off a couple of times in recent months just after starting. Anyone think it could be fuel pump or fuel filter and if so is there a link to someone doing a 2001 X5 4.4i replacement?