Tiny small fixes to make new containers work (closes #102)