Changes to build Omni