Address some issues raised by @nnnick
Merge branch 'empty_charts' into hone