Composition fixes