Fixed some container escape issues