Further URL corrections, as per CDeane