Small Container CL Changes