More link fixes and patching some stupid parameter problem