fix container template usage for more strict gcc type rules