Tweaks to URL validation