Attempt to improve exclusions patterns