Partially fixed Windows linking issue