Tweaks and fixes for graphing