Fix urls and duplicate import