More fixes for ITS.