extract: fix typo, add missing devices

Change-Id: Ic395e8f61bd4e7bade08254e8f200c69e0cfde04