diff --git a/include/concurrency/timestamp.h b/include/concurrency/timestamp.h
index ad45b62..70383d9 100644
--- a/include/concurrency/timestamp.h
+++ b/include/concurrency/timestamp.h
@@ -35,7 +35,7 @@ namespace beedb::concurrency
  *
  * The time "0" in combination with the set committed flag indicates "infinity".
  */
-class timestamp
+class alignas(64) timestamp
 {
   public:
     using timestamp_t = std::uint64_t;
@@ -113,4 +113,4 @@ class timestamp
     // Time and committed flag (last bit).
     timestamp_t _timestamp_and_committed_flag = 1u;
 };
-} // namespace beedb::concurrency
\ No newline at end of file
+} // namespace beedb::concurrency
diff --git a/include/storage/record_identifier.h b/include/storage/record_identifier.h
index 5b54f36..f0f8c2d 100644
--- a/include/storage/record_identifier.h
+++ b/include/storage/record_identifier.h
@@ -26,7 +26,7 @@
 
 namespace beedb::storage
 {
-class RecordIdentifier
+class alignas(64) RecordIdentifier
 {
   public:
     static_assert(sizeof(Page::id_t) + sizeof(std::uint16_t) <= sizeof(std::uint64_t));
@@ -88,4 +88,4 @@ template <> struct hash<beedb::storage::RecordIdentifier>
         return std::hash<std::uint64_t>()(static_cast<std::uint64_t>(rid));
     }
 };
-} // namespace std
\ No newline at end of file
+} // namespace std
diff --git a/src/io/client_console.cpp b/src/io/client_console.cpp
index 17aa053..030b96a 100644
--- a/src/io/client_console.cpp
+++ b/src/io/client_console.cpp
@@ -112,7 +112,7 @@ bool ClientConsole::handle_response(const std::string &response)
     }
     else if (server_response->type() == ServerResponse::Type::ServerClosed)
     {
-        std::cout << "Server sopped." << std::endl;
+        std::cout << "Server stopped." << std::endl;
         return false;
     }
 
@@ -142,4 +142,4 @@ void ClientConsole::plan_to_table(util::TextTable &table, nlohmann::json &layer,
             plan_to_table(table, child, depth + 2);
         }
     }
-}
\ No newline at end of file
+}