Fix comments and log messages.