Make link creation work