Fix cluster-info bugs