Fixed some issues with exclusions