Small fixes on disaggregation