More link creation bugs