Fix some basic vulnerabilities