Dashboard issue fixes