Fix issues on the device