Improve logging in NCMP