Fixes for oe-alliance oe