Buylink fixes