Fixes for chart renderer