Fixed some container stuff