fixes to Container Helper