diff --git a/modules/c++/nitf/include/nitf/SubWindow.hpp b/modules/c++/nitf/include/nitf/SubWindow.hpp
index 1cf3c1c57..485d952aa 100644
--- a/modules/c++/nitf/include/nitf/SubWindow.hpp
+++ b/modules/c++/nitf/include/nitf/SubWindow.hpp
@@ -119,12 +119,7 @@ DECLARE_CLASS(SubWindow)
     std::optional<std::vector<uint32_t>> bandList;
 };
 
-// This template<template> syntax allows an arbitary TContainer<uint32_t> to be passed
-// rather than requiring that it be std::vector<uint32_t>.  Note that the container
-// must support data() and size().
-template<template<typename, typename...> typename TContainer, typename ...TAlloc>
-inline void setBands(SubWindow& subWindow,
-    TContainer<uint32_t, TAlloc...>& bandList) // std::vector<T> really has another template parameter
+inline void setBands(SubWindow& subWindow, std::vector<uint32_t>& bandList)
 {
     subWindow.setBandList(bandList.data());
     subWindow.setNumBands(gsl::narrow<uint32_t>(bandList.size()));
diff --git a/modules/c++/nitf/include/nitf/System.hpp b/modules/c++/nitf/include/nitf/System.hpp
index 001852bc8..94bd86a04 100644
--- a/modules/c++/nitf/include/nitf/System.hpp
+++ b/modules/c++/nitf/include/nitf/System.hpp
@@ -54,7 +54,7 @@ typedef nitf_Off Off;
 typedef nitf_AccessFlags AccessFlags;
 typedef nitf_CreationFlags CreationFlags;
 
-using byte = std::byte;
+using byte = sys::byte;
 
 using Version = nitf_Version;
 using FieldType = nitf_FieldType;