Charges Bug Fixes