XSS adjustments, caught a couple more.