Fixed linking problems