Url + small fixes