Fix slow O inserts