Fixed some issues happend on the device.