more fixes to link