diff --git a/EightBit/BigEndianProcessor.cs b/EightBit/BigEndianProcessor.cs
index 525ae16..242bce3 100644
--- a/EightBit/BigEndianProcessor.cs
+++ b/EightBit/BigEndianProcessor.cs
@@ -14,18 +14,21 @@ namespace EightBit
 
         public override void PokeWord(ushort address, Register16 value)
         {
+            ArgumentNullException.ThrowIfNull(value);
             this.Bus.Poke(address, value.High);
             this.Bus.Poke(++address, value.Low);
         }
 
         protected override void FetchInto(Register16 into)
         {
+            ArgumentNullException.ThrowIfNull(into);
             into.High = this.FetchByte();
             into.Low = this.FetchByte();
         }
 
         protected override void GetInto(Register16 into)
         {
+            ArgumentNullException.ThrowIfNull(into);
             into.High = this.MemoryRead();
             _ = this.Bus.Address.Increment();
             into.Low = this.MemoryRead();
@@ -41,18 +44,21 @@ namespace EightBit
 
         protected override void PopInto(Register16 into)
         {
+            ArgumentNullException.ThrowIfNull(into);
             into.High = this.Pop();
             into.Low = this.Pop();
         }
 
         protected override void PushWord(Register16 value)
         {
+            ArgumentNullException.ThrowIfNull(value);
             this.Push(value.Low);
             this.Push(value.High);
         }
 
         protected override void SetWord(Register16 value)
         {
+            ArgumentNullException.ThrowIfNull(value);
             this.MemoryWrite(value.High);
             _ = this.Bus.Address.Increment();
             this.MemoryWrite(value.Low);
@@ -60,6 +66,7 @@ namespace EightBit
 
         protected override void SetWordPaged(Register16 value)
         {
+            ArgumentNullException.ThrowIfNull(value);
             this.MemoryWrite(value.High);
             ++this.Bus.Address.Low;
             this.MemoryWrite(value.Low);
diff --git a/EightBit/Bus.cs b/EightBit/Bus.cs
index aa1664a..c14f3dd 100644
--- a/EightBit/Bus.cs
+++ b/EightBit/Bus.cs
@@ -24,13 +24,21 @@ namespace EightBit
 
         public byte Peek(ushort absolute) => this.Reference(absolute);
 
-        public byte Peek(Register16 absolute) => this.Peek(absolute.Word);
+        public byte Peek(Register16 absolute)
+        {
+            ArgumentNullException.ThrowIfNull(absolute);
+            return this.Peek(absolute.Word);
+        }
 
         public void Poke(byte value) => this.Reference() = value;
 
         public void Poke(ushort absolute, byte value) => this.Reference(absolute) = value;
 
-        public void Poke(Register16 absolute, byte value) => this.Poke(absolute.Word, value);
+        public void Poke(Register16 absolute, byte value)
+        {
+            ArgumentNullException.ThrowIfNull(absolute);
+            this.Poke(absolute.Word, value);
+        }
 
         public byte Read()
         {
diff --git a/EightBit/EightBit.UnitTest/EightBit.UnitTest.csproj b/EightBit/EightBit.UnitTest/EightBit.UnitTest.csproj
index eea8318..02dc9ba 100644
--- a/EightBit/EightBit.UnitTest/EightBit.UnitTest.csproj
+++ b/EightBit/EightBit.UnitTest/EightBit.UnitTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
 	<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
-	<AnalysisLevel>latest</AnalysisLevel>
+	<AnalysisLevel>latest-all</AnalysisLevel>
 	<!--
       Displays error on console in addition to the log file. Note that this feature comes with a performance impact.
       For more information, visit https://learn.microsoft.com/dotnet/core/testing/unit-testing-platform-integration-dotnet-test#show-failure-per-test
diff --git a/EightBit/EightBit.csproj b/EightBit/EightBit.csproj
index 2dfb4d8..12f6aa0 100644
--- a/EightBit/EightBit.csproj
+++ b/EightBit/EightBit.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>False</GenerateDocumentationFile>
     <SignAssembly>False</SignAssembly>
     <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
-    <AnalysisLevel>latest-recommended</AnalysisLevel>
+    <AnalysisLevel>latest-all</AnalysisLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
diff --git a/EightBit/InputOutput.cs b/EightBit/InputOutput.cs
index aafbc7f..675369d 100644
--- a/EightBit/InputOutput.cs
+++ b/EightBit/InputOutput.cs
@@ -22,6 +22,7 @@ namespace EightBit
 
         public byte ReadInputPort(Register16 port)
         {
+            ArgumentNullException.ThrowIfNull(port);
             ReadingPort?.Invoke(this, new PortEventArgs(port));
             var value = this._input[port.Word];
             ReadPort?.Invoke(this, new PortEventArgs(port));
@@ -30,12 +31,17 @@ namespace EightBit
 
         public void WriteInputPort(ushort port, byte value) => this._input[port] = value;
 
-        public void WriteInputPort(Register16 port, byte value) => this.WriteInputPort(port.Word, value);
+        public void WriteInputPort(Register16 port, byte value)
+        {
+            ArgumentNullException.ThrowIfNull(port);
+            this.WriteInputPort(port.Word, value);
+        }
 
         public void Write(Register16 port, byte value) => this.WriteOutputPort(port, value);
 
         public void WriteOutputPort(Register16 port, byte value)
         {
+            ArgumentNullException.ThrowIfNull(port);
             WritingPort?.Invoke(this, new PortEventArgs(port));
             this._output[port.Word] = value;
             WrittenPort?.Invoke(this, new PortEventArgs(port));
@@ -43,6 +49,10 @@ namespace EightBit
 
         public byte ReadOutputPort(ushort port) => this._output[port];
 
-        public byte ReadOutputPort(Register16 port) => this.ReadOutputPort(port.Word);
+        public byte ReadOutputPort(Register16 port)
+        {
+            ArgumentNullException.ThrowIfNull(port);
+            return this.ReadOutputPort(port.Word);
+        }
     }
 }
diff --git a/EightBit/IntelProcessor.cs b/EightBit/IntelProcessor.cs
index 19682d1..8ae786f 100644
--- a/EightBit/IntelProcessor.cs
+++ b/EightBit/IntelProcessor.cs
@@ -285,5 +285,8 @@ namespace EightBit
         protected virtual void ReturnConditionalFlag(int flag) => this.ReturnConditional(this.ConvertCondition(flag));
 
         protected virtual void CallConditionalFlag(int flag) => this.CallConditional(this.ConvertCondition(flag));
+
+        protected virtual void CPL() => this.A = (byte)~this.A;
+
     }
 }
diff --git a/EightBit/LittleEndianProcessor.cs b/EightBit/LittleEndianProcessor.cs
index ab06d69..f809417 100644
--- a/EightBit/LittleEndianProcessor.cs
+++ b/EightBit/LittleEndianProcessor.cs
@@ -15,18 +15,21 @@ namespace EightBit
 
         public override void PokeWord(ushort address, Register16 value)
         {
+            ArgumentNullException.ThrowIfNull(value);
             this.Bus.Poke(address, value.Low);
             this.Bus.Poke(++address, value.High);
         }
 
         protected override void FetchInto(Register16 into)
         {
+            ArgumentNullException.ThrowIfNull(into);
             into.Low = this.FetchByte();
             into.High = this.FetchByte();
         }
 
         protected override void GetInto(Register16 into)
         {
+            ArgumentNullException.ThrowIfNull(into);
             into.Low = this.MemoryRead();
             _ = this.Bus.Address.Increment();
             into.High = this.MemoryRead();
@@ -42,18 +45,21 @@ namespace EightBit
 
         protected override void PopInto(Register16 into)
         {
+            ArgumentNullException.ThrowIfNull(into);
             into.Low = this.Pop();
             into.High = this.Pop();
         }
 
         protected override void PushWord(Register16 value)
         {
+            ArgumentNullException.ThrowIfNull(value);
             this.Push(value.High);
             this.Push(value.Low);
         }
 
         protected override void SetWord(Register16 value)
         {
+            ArgumentNullException.ThrowIfNull(value);
             this.MemoryWrite(value.Low);
             _ = this.Bus.Address.Increment();
             this.MemoryWrite(value.High);
@@ -61,6 +67,7 @@ namespace EightBit
 
         protected override void SetWordPaged(Register16 value)
         {
+            ArgumentNullException.ThrowIfNull(value);
             this.MemoryWrite(value.Low);
             ++this.Bus.Address.Low;
             this.MemoryWrite(value.High);
diff --git a/EightBit/Register16.cs b/EightBit/Register16.cs
index 0c31602..c69e519 100644
--- a/EightBit/Register16.cs
+++ b/EightBit/Register16.cs
@@ -45,6 +45,7 @@ namespace EightBit
 
         public Register16(Register16 rhs)
         {
+            ArgumentNullException.ThrowIfNull(rhs);
             this.Low = rhs.Low;
             this.High = rhs.High;
         }
@@ -71,7 +72,11 @@ namespace EightBit
 
         public ref byte High => ref this._high;
 
-        public static bool operator ==(Register16 left, Register16 right) => left.Equals(right);
+        public static bool operator ==(Register16 left, Register16 right)
+        {
+            ArgumentNullException.ThrowIfNull(left);
+            return left.Equals(right);
+        }
 
         public static bool operator !=(Register16 left, Register16 right) => !(left == right);
 
@@ -89,6 +94,7 @@ namespace EightBit
 
         public void Assign(Register16 from)
         {
+            ArgumentNullException.ThrowIfNull(from);
             this.Low = from.Low;
             this.High = from.High;
         }
diff --git a/Fuse/Fuse.csproj b/Fuse/Fuse.csproj
index cbade90..64758fc 100644
--- a/Fuse/Fuse.csproj
+++ b/Fuse/Fuse.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>False</GenerateDocumentationFile>
diff --git a/Intel8080/Intel8080.Test/Intel8080.Test.csproj b/Intel8080/Intel8080.Test/Intel8080.Test.csproj
index d32f3d5..61437d9 100644
--- a/Intel8080/Intel8080.Test/Intel8080.Test.csproj
+++ b/Intel8080/Intel8080.Test/Intel8080.Test.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>False</GenerateDocumentationFile>
     <SignAssembly>False</SignAssembly>
     <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
-    <AnalysisLevel>latest</AnalysisLevel>
+    <AnalysisLevel>latest-all</AnalysisLevel>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/Intel8080/Intel8080.csproj b/Intel8080/Intel8080.csproj
index 12714af..3f94540 100644
--- a/Intel8080/Intel8080.csproj
+++ b/Intel8080/Intel8080.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>False</GenerateDocumentationFile>
diff --git a/LR35902/LR35902.BlarggTest/LR35902.BlarggTest.csproj b/LR35902/LR35902.BlarggTest/LR35902.BlarggTest.csproj
index d36dbaf..2dc8a8c 100644
--- a/LR35902/LR35902.BlarggTest/LR35902.BlarggTest.csproj
+++ b/LR35902/LR35902.BlarggTest/LR35902.BlarggTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>False</GenerateDocumentationFile>
diff --git a/LR35902/LR35902.FuseTest/LR35902.FuseTest.csproj b/LR35902/LR35902.FuseTest/LR35902.FuseTest.csproj
index af2310c..49b5ac5 100644
--- a/LR35902/LR35902.FuseTest/LR35902.FuseTest.csproj
+++ b/LR35902/LR35902.FuseTest/LR35902.FuseTest.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>False</GenerateDocumentationFile>
     <SignAssembly>False</SignAssembly>
     <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
-    <AnalysisLevel>latest</AnalysisLevel>
+    <AnalysisLevel>latest-all</AnalysisLevel>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/LR35902/LR35902.cs b/LR35902/LR35902.cs
index 7771d6b..d22dd8f 100644
--- a/LR35902/LR35902.cs
+++ b/LR35902/LR35902.cs
@@ -553,7 +553,7 @@ namespace LR35902
                             switch (q)
                             {
                                 case 0: // LD rp,nn
-                                    this.RP(p).Assign(this.FetchWord());
+                                    this.FetchInto(this.RP(p));
                                     break;
 
                                 case 1: // ADD HL,rp
@@ -676,7 +676,7 @@ namespace LR35902
                                     this.DAA();
                                     break;
                                 case 5:
-                                    this.Cpl();
+                                    this.CPL();
                                     break;
                                 case 6:
                                     this.SCF();
@@ -1150,10 +1150,10 @@ namespace LR35902
             this.F = AdjustZero(this.F, this.A);
         }
 
-        private void Cpl()
+        protected override void CPL()
         {
+            base.CPL();
             this.F = SetBit(this.F, StatusBits.HC | StatusBits.NF);
-            this.A = (byte)~this.A;
         }
 
         private void SCF()
diff --git a/LR35902/LR35902.csproj b/LR35902/LR35902.csproj
index 817da1d..a40604a 100644
--- a/LR35902/LR35902.csproj
+++ b/LR35902/LR35902.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>False</GenerateDocumentationFile>
diff --git a/LR35902/SM83.HarteTest/SM83.HarteTest.csproj b/LR35902/SM83.HarteTest/SM83.HarteTest.csproj
index 4cf2bec..853d528 100644
--- a/LR35902/SM83.HarteTest/SM83.HarteTest.csproj
+++ b/LR35902/SM83.HarteTest/SM83.HarteTest.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
-	<AnalysisLevel>latest-recommended</AnalysisLevel>
+	<AnalysisLevel>latest-all</AnalysisLevel>
   </PropertyGroup>
 
 	<ItemGroup>
diff --git a/M6502/M6502.HarteTest/M6502.HarteTest.csproj b/M6502/M6502.HarteTest/M6502.HarteTest.csproj
index 7c5dc9e..1d785d0 100644
--- a/M6502/M6502.HarteTest/M6502.HarteTest.csproj
+++ b/M6502/M6502.HarteTest/M6502.HarteTest.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
-    <AnalysisLevel>latest-recommended</AnalysisLevel>
+    <AnalysisLevel>latest-all</AnalysisLevel>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/M6502/M6502.Symbols/M6502.Symbols.csproj b/M6502/M6502.Symbols/M6502.Symbols.csproj
index 5f762a1..949de0e 100644
--- a/M6502/M6502.Symbols/M6502.Symbols.csproj
+++ b/M6502/M6502.Symbols/M6502.Symbols.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
diff --git a/M6502/M6502.csproj b/M6502/M6502.csproj
index 6368857..61c2014 100644
--- a/M6502/M6502.csproj
+++ b/M6502/M6502.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>False</GenerateDocumentationFile>
diff --git a/MC6809/MC6809.Test/MC6809.Test.csproj b/MC6809/MC6809.Test/MC6809.Test.csproj
index e895cf7..9ea2f80 100644
--- a/MC6809/MC6809.Test/MC6809.Test.csproj
+++ b/MC6809/MC6809.Test/MC6809.Test.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>False</GenerateDocumentationFile>
     <SignAssembly>False</SignAssembly>
     <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
-    <AnalysisLevel>latest</AnalysisLevel>
+    <AnalysisLevel>latest-all</AnalysisLevel>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/MC6809/MC6809.UnitTest/MC6809.UnitTest.csproj b/MC6809/MC6809.UnitTest/MC6809.UnitTest.csproj
index 79eb1da..c9d9c55 100644
--- a/MC6809/MC6809.UnitTest/MC6809.UnitTest.csproj
+++ b/MC6809/MC6809.UnitTest/MC6809.UnitTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -11,7 +11,7 @@
     <OutputType>Exe</OutputType>
     <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
     <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
-    <AnalysisLevel>latest</AnalysisLevel>
+    <AnalysisLevel>latest-all</AnalysisLevel>
     <!--
       Displays error on console in addition to the log file. Note that this feature comes with a performance impact.
       For more information, visit https://learn.microsoft.com/dotnet/core/testing/unit-testing-platform-integration-dotnet-test#show-failure-per-test
diff --git a/MC6809/MC6809.csproj b/MC6809/MC6809.csproj
index 583665b..222fc57 100644
--- a/MC6809/MC6809.csproj
+++ b/MC6809/MC6809.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>False</GenerateDocumentationFile>
diff --git a/MC6850/MC6850.csproj b/MC6850/MC6850.csproj
index 3ec3ac4..64758fc 100644
--- a/MC6850/MC6850.csproj
+++ b/MC6850/MC6850.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>False</GenerateDocumentationFile>
     <SignAssembly>False</SignAssembly>
     <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
-    <AnalysisLevel>latest</AnalysisLevel>
+    <AnalysisLevel>latest-all</AnalysisLevel>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/Z80/Z80.FuseTest/Z80.FuseTest.csproj b/Z80/Z80.FuseTest/Z80.FuseTest.csproj
index de3102f..490eefd 100644
--- a/Z80/Z80.FuseTest/Z80.FuseTest.csproj
+++ b/Z80/Z80.FuseTest/Z80.FuseTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>False</GenerateDocumentationFile>
diff --git a/Z80/Z80.HarteTest/Z80.HarteTest.csproj b/Z80/Z80.HarteTest/Z80.HarteTest.csproj
index 46bea42..309d9be 100644
--- a/Z80/Z80.HarteTest/Z80.HarteTest.csproj
+++ b/Z80/Z80.HarteTest/Z80.HarteTest.csproj
@@ -2,9 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
+    <AnalysisLevel>latest-all</AnalysisLevel>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Z80/Z80.Test/Z80.Test.csproj b/Z80/Z80.Test/Z80.Test.csproj
index fbe2021..77c418c 100644
--- a/Z80/Z80.Test/Z80.Test.csproj
+++ b/Z80/Z80.Test/Z80.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>False</GenerateDocumentationFile>
diff --git a/Z80/Z80.cs b/Z80/Z80.cs
index 8335a3b..c3c2b5c 100644
--- a/Z80/Z80.cs
+++ b/Z80/Z80.cs
@@ -522,8 +522,8 @@ namespace Z80
             {
                 this.RefreshMemory();
             }
-            this.OnReadMemory();
             this.Tick();
+            this.OnReadMemory();
             return this.Bus.Data;
         }
 
@@ -1169,7 +1169,7 @@ namespace Z80
                             switch (q)
                             {
                                 case 0: // LD rp,nn
-                                    this.RP(p).Assign(this.FetchWord());
+                                    this.FetchInto(this.RP(p));
                                     break;
                                 case 1: // ADD HL,rp
                                     this.HL2().Assign(this.Add(this.HL2(), this.RP(p)));
@@ -1816,20 +1816,20 @@ namespace Z80
 
         private byte RL(byte operand)
         {
-            this.ClearBit(StatusBits.NF | StatusBits.HC);
             var carry = this.Carry();
             this.SetBit(StatusBits.CF, operand & (byte)Bits.Bit7);
             var result = (byte)((operand << 1) | carry);
+            this.ClearBit(StatusBits.NF | StatusBits.HC);
             this.AdjustXY(result);
             return result;
         }
 
         private byte RR(byte operand)
         {
-            this.ClearBit(StatusBits.NF | StatusBits.HC);
             var carry = this.Carry();
             this.SetBit(StatusBits.CF, operand & (byte)Bits.Bit0);
             var result = (byte)((operand >> 1) | (carry << 7));
+            this.ClearBit(StatusBits.NF | StatusBits.HC);
             this.AdjustXY(result);
             return result;
         }
@@ -1934,10 +1934,11 @@ namespace Z80
             this.AdjustXY((byte)((this.Q ^ this.F) | this.A));
         }
 
-        private void CPL()
+        protected override void CPL()
         {
+            base.CPL();
             this.SetBit(StatusBits.HC | StatusBits.NF);
-            this.AdjustXY(this.A = (byte)~this.A);
+            this.AdjustXY(this.A);
         }
 
         private void XHTL(Register16 exchange)
diff --git a/Z80/Z80.csproj b/Z80/Z80.csproj
index 5dfccc6..0385b9f 100644
--- a/Z80/Z80.csproj
+++ b/Z80/Z80.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>False</GenerateDocumentationFile>