Fast charge fixes

Change-Id: If8b9ed941a6d7566b2178d19c92b59f99f1f547e