Partial fixes for dashboard issues. WIP