Small Dashboard fixes