[FOLD] container fixes