Fix bar and column charts