aggregate instrument and fix other breakages after latest merge