[COS] Some minor changes