Fixed linking errors