Fix a few problems occuring because of the IvToolkit update