- Fix minor bug related to save/update Device