Fix build & added a few more devices.