Fixes to Dashboard-related stuff