Fix Issue #436, #453 and #371: Composition complete callbacks not trigged