Corrections to make it work with OT 2.0