Fixing some url issues