--Fixes for dashboard error