OREd: Various fixes