Fix a few bugs with Ibis stuff.