Fix for omni build error