minor fixes to device controller