Fixed problems with URLs