Some issues fixed inside link plugin

Affects issues #124 and #110.