More fixes for Url