Miscellaneous dashboard fatal error fixes
Merge pull request #1682 from Shotster/misc-5.7-fatal-error-fixes

Miscellaneous dashboard fatal error fixes