fixed O2 device definitions