Minor tweaks in URL generator