Fixed a couple of bugs with linkApi