Orca 2.2 minor fixes