Fix aggregate build