Backport oe-a fixes