Fixed build errors in OI from merge