Really fixing those URLs now