Fixed up linking issues