Fixes for link field