fixed issues with new PatchableContainerHelper<> usage (issues only noticed with gcc)