fixed small gcc-specific issues wtih container template changes