Fixes to dashboard;