Fixes a few other potential xss entry points