Some device boxes.
A few fixes.