Fix and add devices