[ClearSuite] Minor changes