More fixes for url problems