Dashboard fixes