Fixing service links