Fixing ORI bugs

`