diff --git a/sf-stream/include/FastQueue.hpp b/sf-stream/include/FastQueue.hpp
index 95c1331..916b838 100644
--- a/sf-stream/include/FastQueue.hpp
+++ b/sf-stream/include/FastQueue.hpp
@@ -12,8 +12,8 @@ class FastQueue {
     char* buffer_;
     std::atomic_int* buffer_status_;
 
-    std::atomic_uint16_t write_slot_id_;
-    std::atomic_uint16_t read_slot_id_;
+    std::atomic_int write_slot_id_;
+    std::atomic_int read_slot_id_;
 
 public:
 
diff --git a/sf-stream/src/FastQueue.cpp b/sf-stream/src/FastQueue.cpp
index 1db833e..1a67664 100644
--- a/sf-stream/src/FastQueue.cpp
+++ b/sf-stream/src/FastQueue.cpp
@@ -15,7 +15,6 @@ FastQueue<T>::FastQueue(
     buffer_ = new char[slot_n_bytes_ * n_slots_];
     buffer_status_ = new atomic_int[n_slots];
 
-    // TODO: Are atomic variables initialized?
     for (size_t i=0; i < n_slots_; i++) {
         buffer_status_[i] = 0;
     }