fixing all CanaryContainer*