Fix comments before merge