Remote URLs fixes