Fix dashboard errors
Created by: chuckatkins
@williamfgc please see changes in 87340691ec103148968563919a12155a7760299e and 79a13e77b71030b732d0775ca2af2b40a0f40332 @pnorbert Is this sufficient: af109d714e332bad5d0c932bdab8086d851d8e7d
Created by: chuckatkins
@williamfgc please see changes in 87340691ec103148968563919a12155a7760299e and 79a13e77b71030b732d0775ca2af2b40a0f40332 @pnorbert Is this sufficient: af109d714e332bad5d0c932bdab8086d851d8e7d