ocgcore fixes