fixes for charts and calendar