Various OC2 fixes