Bugfix device modify and add.