Fixing bugs in device create
Fixes bugs in action create