Fixed defects related to review 1629 -- RSI messages, bad comments, etc.