Switch rigorous URL validation back on. More small cleanups