Fixes in devicelist