A couple template fixes required by gcc