Fixing Omni build system