Fix build errors due to OC