Fixes for link plugin