Pulled in fix for dashboard launching