This is my first true "issue" with the car in almost 4 years. I had my oil changed at the dealership this morning and after leaving and making my next stop I got back in the car and turned it on to see the cel. I checked the dipstick and saw the oil was low so the dealership sent a tech down with oil to get it normal and we drove back to the dealership(10 miles away). And I've never had an issue with the service from this dealership since the day I bought it from them.
Once back they drained the oil and filled it again, then scanned the codes and said it came back the o2 sensor. Once I got home I plugged in my OFT and checked the codes myself and got these codes:

P0101: MASS AIR FLOW CURCUIT RANGE/ PERFORMANCE PROBLEM
P3700: ?
And YES, I searched the codes and tried to find any related issues but didn't have a lot of luck. Just led me to this site with a list of codes:
http://ft86tech.com/frs-brz-error-codes/
I still have the car, but noticed the shifts feel harder when the car downshifts. I'm not sure if I should try to replace the mass air flow sensor or just wait and let them replace the o2 sensor first and see where that gets me? Would there be anything I need to watch for before or after it's replaced?
Any input would be greatly appreciated!!