Small updates to charges system