master: Further URL fixes