Some more fixes to site urls
Some more fixes to site urls