Fix kind exclusion and mapping