Security Fixes - XSS Vulnerabilities

This corrects 3 XSS vulnerabilities, and 1 possible XSS. 

CVE-2008-4730
CVE-2014-2890