A few charging fixes