Fixing some problems with urls