More dashboard fixes