Fix findings.
Fix for findings.