More patch URL determination improvements