CND typo and config cleanup