[] fix up more Ibor items
[] fix up more futures instruments