Fixed CLS-compliant issues.