fixed some issues with device/share