Final fixes for working Omni install