Some changes to restore the @rpath linking mechanism