Charging system issues and fixes