Fix SO Security vulnerabilities