Fixed some issues with recreating device from DeviceStore