Minor Changes to Template Library