Dashboards fixes