fixes in oai target