Fix arg collisions
Fix ds link line