More fixes to internaliser.