Minor device bringup

Compared to chad's changes