Fix OC_Helper and change deprecated methods