autocharge fixes