Merge "Fix some comments"