#1791: Fix comments