Fixing previous errors with templates/missing symbols