fixing missing template definitions

Slattery, Stuartrequested to merge
(removed):fix_template_errors into master

Fixing some errors that GCC 5.5 missed but that Clang and GCC 7 found.

Merge request reports