Fix urls more