Minor cleanup
Merge branch 'dashboard'