Charts and Stats Builder Bugfixes