Fixed up URLs and their parameters