enable CNK build config, cleanup of some linking