fixes to make it work on OIT