fixes for autocharge