Attempt to fix linking issues