Post-compo changes