AccountingPlot fixes; core fixes