diff --git a/CHANGELOG.md b/CHANGELOG.md
index e59d3ee43..ec72c19d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ Planned future work is listed at the bottom.
   - Rust 2018. All `Cargo.toml` files now contain `edition = "2018"` and the code has been cleaned up to benefit from 
     some of the improvements in the language. e.g. many `extern crate` declarations have been removed. Your own code
     can be Rust 2015 but you must build with Rust 1.31 or later.
-  - Client API has been simplified for ad hoc connections and now has more documentation.
+  - Client API has been simplified for ad hoc connections and with better documentation.
   - Client API will reconnect and restore subscriptions after a disconnect from a server. Reconnection is 
     controlled by a session retry policy.
   - Improved subscription & monitored item behaviour in server, e.g. notifications are acknowledged upon
diff --git a/README.md b/README.md
index b52bcf70a..c2659d88c 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ Read the [change log](./CHANGELOG.md) for changes per version as well as aspirat
 
 Read the [compatibility](./docs/compatibility.md) page for how the implementation conforms with the OPC UA spec.
 
-The API documentation is generated from the latest published crates which may be some way behind current development. 
+The API documentation is generated from the latest published crates. This may be some way behind current development. 
 
 <table>
     <tr>
diff --git a/integration/src/tests.rs b/integration/src/tests.rs
index 87e208504..de9781edd 100644
--- a/integration/src/tests.rs
+++ b/integration/src/tests.rs
@@ -1,7 +1,7 @@
 use std::{
     sync::{
         Arc, Mutex, RwLock, mpsc, mpsc::channel,
-        atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT},
+        atomic::{AtomicUsize, Ordering},
     },
     thread, time,
 };
@@ -142,7 +142,7 @@ fn connect_basic256sha256_sign_and_encrypt() {
     connect_with(next_port_offset(), ENDPOINT_ID_BASIC256SHA256_SIGN_ENCRYPT);
 }
 
-static NEXT_PORT_OFFSET: AtomicUsize = ATOMIC_USIZE_INIT;
+static NEXT_PORT_OFFSET: AtomicUsize = AtomicUsize::new(0);
 
 fn next_port_offset() -> u16 {
     // hand out an incrementing port so tests can be run in parallel without interfering with each other
diff --git a/types/src/node_id.rs b/types/src/node_id.rs
index 87f4459b7..f84388ff2 100644
--- a/types/src/node_id.rs
+++ b/types/src/node_id.rs
@@ -4,7 +4,7 @@ use std::{
     self, u16, u32,
     fmt,
     io::{Read, Write}, str::FromStr,
-    sync::atomic::{ATOMIC_USIZE_INIT, AtomicUsize, Ordering},
+    sync::atomic::{AtomicUsize, Ordering},
 };
 
 use crate::{
@@ -341,7 +341,7 @@ impl From<(u16, ByteString)> for NodeId {
     }
 }
 
-static NEXT_NODE_ID_NUMERIC: AtomicUsize = ATOMIC_USIZE_INIT;
+static NEXT_NODE_ID_NUMERIC: AtomicUsize = AtomicUsize::new(0);
 
 impl Default for NodeId {
     fn default() -> Self {