Fixes to link command