Small changes to charges controller.