Small STLWrapper support container fixes - use more patching