Fixes to exclude feature