fixes for oim