Fixing some more comments

Change-Id: I383e084d27ed18d09c50a85042ba913cc3148900