aggregate fixes