Remove useless differences with regular OAI, enhance the build to be compatible with regular binaries