Fix comments and messages