small oai fixes