Minor changes to fix charges formatting exceptions.