Fixing link problems