Fixed two possible XSS issues