Little fixes
Make CompositionContainer thread safe