more fixes for self in charts.