Corrected scopes of paragraphs
Corrected warning messages