Fixes to URL's