Fix some fast charge related files