Fix comments from Anil