Fix some linking