More fixes to urls