Again with the fast charge fixes