Changes for OmniRom