Fix a couple crashes with new oxygen changes. Also balanced oxygen tank use a bit.