Cook 2935: device mapping issues