Fixing small issues with OIMO