Some minor fixes from the dashboard refactoring