Various charging fixes

@megous recommended we apply these, it should solve various charging issues users have been experiencing. I'm unsure how necessary the last 2 are, in fact I don't see the last one ever being upstreamed. If we can do without them, that'd be great.