A couple of small fixes for the new Url class