More tweaking of the prototype device management system.