some more fixes to get URL's right