Fixed linking issues