Lots of extraction overrides found

Change-Id: I86b4462da365c9edee3f6b4d0c48f15f4845fc42