Fixed all issues found.