fixes for device/save