More URL validity fixes