Chart fixes

This is #1745, but on a branch in our repo so I can work on it as well. [IRC](https://botbot.me/freenode/gittip/msg/8709078/)