diff --git a/repertory/librepertory/include/comm/packet/packet.hpp b/repertory/librepertory/include/comm/packet/packet.hpp
index 2d9ac420..24570331 100644
--- a/repertory/librepertory/include/comm/packet/packet.hpp
+++ b/repertory/librepertory/include/comm/packet/packet.hpp
@@ -52,23 +52,23 @@ public:
   ~packet() = default;
 
 private:
-  data_buffer buffer_;
-  std::size_t decode_offset_ = 0U;
+  data_buffer buffer_{};
+  std::size_t decode_offset_{0U};
 
 public:
-  [[nodiscard]] static auto decode_json(packet &response,
-                                        json &json_data) -> int;
+  [[nodiscard]] static auto decode_json(packet &response, json &json_data)
+      -> int;
 
 public:
   void clear();
 
   [[nodiscard]] auto current_pointer() -> unsigned char * {
-    return (decode_offset_ < buffer_.size()) ? &buffer_[decode_offset_]
+    return (decode_offset_ < buffer_.size()) ? &buffer_.at(decode_offset_)
                                              : nullptr;
   }
 
   [[nodiscard]] auto current_pointer() const -> const unsigned char * {
-    return (decode_offset_ < buffer_.size()) ? &buffer_[decode_offset_]
+    return (decode_offset_ < buffer_.size()) ? &buffer_.at(decode_offset_)
                                              : nullptr;
   }
 
diff --git a/repertory/librepertory/include/comm/packet/packet_server.hpp b/repertory/librepertory/include/comm/packet/packet_server.hpp
index 8c847a7e..b3c41708 100644
--- a/repertory/librepertory/include/comm/packet/packet_server.hpp
+++ b/repertory/librepertory/include/comm/packet/packet_server.hpp
@@ -52,8 +52,8 @@ public:
 
 private:
   struct connection {
-    connection(io_context &context, tcp::acceptor &acceptor_)
-        : socket(context), acceptor(acceptor_) {}
+    connection(io_context &ctx, tcp::acceptor &acceptor_)
+        : socket(ctx), acceptor(acceptor_) {}
 
     tcp::socket socket;
     tcp::acceptor &acceptor;