- fix some linking