Fixing dashboard issues