diff --git a/.gitignore b/.gitignore
index da20911..ce6cc14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -263,3 +263,4 @@ __pycache__/
 # Custom project ignore
 Examples/ExampleNet47/App.config
 coverage.json
+SpotifyWebApi/FodyWeavers.xsd
diff --git a/SpotifyWebApi/FodyWeavers.xml b/SpotifyWebApi/FodyWeavers.xml
index d75fc78..323841c 100644
--- a/SpotifyWebApi/FodyWeavers.xml
+++ b/SpotifyWebApi/FodyWeavers.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<Weavers>
-  <ConfigureAwait/>
-</Weavers>
\ No newline at end of file
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="FodyWeavers.xsd"
+         VerifyAssembly="true"
+         VerifyIgnoreCodes="0x80131869">
+  <ConfigureAwait />
+</Weavers>
diff --git a/SpotifyWebApi/Model/Auth/Token.cs b/SpotifyWebApi/Model/Auth/Token.cs
index 10be295..fbcd3d0 100644
--- a/SpotifyWebApi/Model/Auth/Token.cs
+++ b/SpotifyWebApi/Model/Auth/Token.cs
@@ -53,13 +53,13 @@ public Token()
         /// Gets the token generated.
         /// </summary>
         [JsonProperty("token_generated")]
-        public DateTime TokenGenerated { get; private set; }
+        public DateTime TokenGenerated { get; set; } = DateTime.UtcNow;
 
         /// <summary>
         /// Gets a value indicating whether this instance is expired.
         /// </summary>
         [JsonIgnore]
-        public bool IsExpired => DateTime.Now > this.TokenGenerated.AddSeconds(this.ExpiresIn);
+        public bool IsExpired => DateTime.UtcNow > this.TokenGenerated.AddSeconds(this.ExpiresIn);
 
         /// <summary>
         /// Gets a value indicating wheter this token can be used to access personal data.
@@ -101,7 +101,7 @@ public static Token Make(
                 RefreshToken = refreshToken,
                 Type = tokenType,
                 ExpiresIn = expiresIn,
-                TokenGenerated = tokenGenerated ?? DateTime.Now,
+                TokenGenerated = tokenGenerated ?? DateTime.UtcNow,
                 Scope = scope ?? string.Empty,
                 CanAccessPersonalData = canAccessPersonalData,
                 AuthenticationType = authenticationType
diff --git a/SpotifyWebApi/Properties/AssemblyInfo.cs b/SpotifyWebApi/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..18b7fec
--- /dev/null
+++ b/SpotifyWebApi/Properties/AssemblyInfo.cs
@@ -0,0 +1,7 @@
+// Internals only visible for testing purpose.
+
+using System.Runtime.CompilerServices;
+using Fody;
+
+[assembly: InternalsVisibleTo("SpotifyWebApiTest")]
+[assembly: ConfigureAwait(false)]
diff --git a/SpotifyWebApi/SpotifyWebApi.cs b/SpotifyWebApi/SpotifyWebApi.cs
index 76b3562..39dc502 100644
--- a/SpotifyWebApi/SpotifyWebApi.cs
+++ b/SpotifyWebApi/SpotifyWebApi.cs
@@ -1,7 +1,3 @@
-// Internals only visible for testing purpose.
-using System.Runtime.CompilerServices;
-[assembly:InternalsVisibleTo("SpotifyWebApiTest")]
-
 namespace SpotifyWebApi
 {
     using System;
diff --git a/SpotifyWebApi/SpotifyWebApi.csproj b/SpotifyWebApi/SpotifyWebApi.csproj
index 19dc77b..b6eee94 100644
--- a/SpotifyWebApi/SpotifyWebApi.csproj
+++ b/SpotifyWebApi/SpotifyWebApi.csproj
@@ -11,7 +11,7 @@
     <Authors>Pim Merks</Authors>
     <Company>Pim Merks</Company>
     <PackageId>SpotifyWebApi-Core</PackageId>
-    <Description>A Spotify Web API wrapper.</Description>
+    <Description>A Spotify Web API wrapper for C#.</Description>
     <Copyright>Pim Merks</Copyright>
     <RepositoryType>Github</RepositoryType>
     <RepositoryUrl>https://github.com/pimmerks/SpotifyWebApi</RepositoryUrl>
@@ -23,13 +23,21 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\LICENSE" Pack="true" PackagePath=""/>
+    <None Include="..\LICENSE" Pack="true" PackagePath="" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
     <PackageReference Include="System.Net.Http" Version="4.3.3" />
-    <PackageReference Include="ConfigureAwait.Fody" Version="2.1.1">
+  </ItemGroup>
+
+  <!-- Development packages -->
+  <ItemGroup>
+    <PackageReference Include="Fody" Version="3.3.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="ConfigureAwait.Fody" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
@@ -43,13 +51,4 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
   </PropertyGroup>
-
-  <!-- Version information will be filled in by a custom CI tool. -->
-  <PropertyGroup Label="Versioner">
-    <Version>0.0.0</Version>
-    <AssemblyVersion>0.0.0</AssemblyVersion>
-    <FileVersion>0.0.0</FileVersion>
-    <InformationalVersion>0.0.0</InformationalVersion>
-  </PropertyGroup>
-
 </Project>