Minor fixes for "create a link" feature