Fixed up linkingness from previous merge