Fix chargeonly mode