Container tweak

526