Fixes in oe client