minor fixes to container code