Address leftover dom references in charts

Fixes #1285 and #1293.