More OmniROM related changes