Fixing server bug, try 1
Bug fix with last commit
Small bug fixes with the dashboards