More excludes for #1814