More fixes for charger