fixes for device/save, command/update