minor template tweaks to get compiling on gcc