fixes for autocharge]