Another round of URL fixes; not right first time