MICA-835: Fix following comments