Several fixes in ITS after heavy testing