Fixed bugs in charting modules