Fixed a few bugs with the charge now mode.