charging fixes