diff --git a/Source/Shared.Test.cs b/Source/Shared.Test.cs
index f6920f4..fb94b26 100644
--- a/Source/Shared.Test.cs
+++ b/Source/Shared.Test.cs
@@ -47,8 +47,10 @@ namespace Nuclex.Support {
     /// </summary>
     [Test]
     public void TestSameInstance() {
+      #pragma warning disable 0618
       Dummy dummyInstance = Shared<Dummy>.Instance;
       Dummy otherDummyInstance = Shared<Dummy>.Instance;
+      #pragma warning restore 0618
       
       // Make sure they're the same instance. We could have put an instance counter in
       // the dummy class, but this might or might not work well across multiple tests
diff --git a/Source/Shared.cs b/Source/Shared.cs
index cdad8e3..a307df1 100644
--- a/Source/Shared.cs
+++ b/Source/Shared.cs
@@ -30,6 +30,7 @@ namespace Nuclex.Support {
   public static class Shared<TShared> where TShared : new() {
 
     /// <summary>Returns the global instance of the class</summary>
+    [Obsolete("Avoid singletons at all costs. Consider a dependency injector instead.")]
     public static TShared Instance {
       [DebuggerStepThrough]
       get { return instance; }
diff --git a/Source/Threading/ParallelBackgroundWorker.Test.cs b/Source/Threading/ParallelBackgroundWorker.Test.cs
index ce646cf..874d377 100644
--- a/Source/Threading/ParallelBackgroundWorker.Test.cs
+++ b/Source/Threading/ParallelBackgroundWorker.Test.cs
@@ -37,7 +37,9 @@ namespace Nuclex.Support.Threading {
     #region class TestWorker
 
     /// <summary>Implementation of a background worker used for unit testing</summary>
+    #pragma warning disable 0618
     private class TestWorker : ParallelBackgroundWorker<object> {
+    #pragma warning restore 0618
 
       /// <summary>Initializes a new parallel background worker with unlimited threads</summary>
       public TestWorker() : base() { }
diff --git a/Source/Threading/ParallelBackgroundWorker.cs b/Source/Threading/ParallelBackgroundWorker.cs
index 2ed3ecc..382cf2e 100644
--- a/Source/Threading/ParallelBackgroundWorker.cs
+++ b/Source/Threading/ParallelBackgroundWorker.cs
@@ -30,6 +30,7 @@ namespace Nuclex.Support.Threading {
 
   /// <summary>Processes tasks in parallel using many threads</summary>
   /// <typeparam name="TTask">Type of tasks the class will process</typeparam>
+  [Obsolete("Use ThreadRunner instead; UI view models should inherit ThreadedViewModel")]
   public abstract class ParallelBackgroundWorker<TTask> : IDisposable {
 
     /// <summary>Number of CPU cores available on the system</summary>
@@ -61,7 +62,7 @@ namespace Nuclex.Support.Threading {
       if(threadCount > 0) {
         this.threadCount = threadCount;
       } else {
-        threadCount = Math.Max(1, ProcessorCount + threadCount);
+        this.threadCount = Math.Max(1, ProcessorCount + threadCount);
       }
 
       this.queueSynchronizationRoot = new object();
@@ -79,7 +80,7 @@ namespace Nuclex.Support.Threading {
     /// <param name="name">Name that will be assigned to the worker threads</param>
     public ParallelBackgroundWorker(string name) :
       this(int.MaxValue) {
-      threadName = name;
+      this.threadName = name;
     }
 
     /// <summary>
@@ -98,7 +99,7 @@ namespace Nuclex.Support.Threading {
     /// </remarks>
     public ParallelBackgroundWorker(string name, int threadCount) :
       this(threadCount) {
-      threadName = name;
+      this.threadName = name;
     }
 
     /// <summary>Immediately releases all resources owned by the instance</summary>
@@ -317,7 +318,6 @@ namespace Nuclex.Support.Threading {
     ///     use this method of synchronization!
     ///   </para>
     /// </remarks>
-    /// 
     private object queueSynchronizationRoot;
 
     /// <summary>Delegate for the runQueuedTasksInThread() method</summary>
diff --git a/Source/Threading/ThreadRunner.cs b/Source/Threading/ThreadRunner.cs
index 748c254..d0b7cf7 100644
--- a/Source/Threading/ThreadRunner.cs
+++ b/Source/Threading/ThreadRunner.cs
@@ -29,7 +29,7 @@ using System.Threading.Tasks;
 namespace Nuclex.Support.Threading {
 
 	/// <summary>Executes actions in a threads</summary>
-	internal abstract class ThreadRunner : IDisposable {
+	public abstract class ThreadRunner : IDisposable {
 
 		#region interface IRunner
 
diff --git a/Source/TypeHelper.cs b/Source/TypeHelper.cs
index e8789ee..5657e68 100644
--- a/Source/TypeHelper.cs
+++ b/Source/TypeHelper.cs
@@ -92,19 +92,6 @@ namespace Nuclex.Support {
       return fieldInfos;
     }
 
-    /// <summary>
-    ///   Adds field informations to a list if they're not already contained in it
-    /// </summary>
-    /// <param name="fieldInfos">List the field informations will be added to</param>
-    /// <param name="fieldInfo">Field informations that will be added to the list</param>
-    private static void addIfNotExists(
-      IDictionary<FieldInfo, object> fieldInfos, FieldInfo fieldInfo
-    ) {
-      if(!fieldInfos.ContainsKey(fieldInfo)) {
-        fieldInfos.Add(fieldInfo, null);
-      }
-    }
-
     /// <summary>Determines whether the given type has a default constructor</summary>
     /// <param name="type">Type which is to be checked</param>
     /// <returns>True if the type has a default constructor</returns>
@@ -142,6 +129,19 @@ namespace Nuclex.Support {
       return (attributes != null) && (attributes.Length > 0);
     }
 
+    /// <summary>
+    ///   Adds field informations to a list if they're not already contained in it
+    /// </summary>
+    /// <param name="fieldInfos">List the field informations will be added to</param>
+    /// <param name="fieldInfo">Field informations that will be added to the list</param>
+    private static void addIfNotExists(
+      IDictionary<FieldInfo, object> fieldInfos, FieldInfo fieldInfo
+    ) {
+      if(!fieldInfos.ContainsKey(fieldInfo)) {
+        fieldInfos.Add(fieldInfo, null);
+      }
+    }
+
   }
 
 } // namespace Nuclex.Support
diff --git a/Source/XmlHelper.cs b/Source/XmlHelper.cs
index a272c03..2bb9a4b 100644
--- a/Source/XmlHelper.cs
+++ b/Source/XmlHelper.cs
@@ -165,7 +165,7 @@ namespace Nuclex.Support {
       XmlReaderSettings settings = new XmlReaderSettings();
       settings.Schemas.Add(schema);
 
-      using (XmlReader reader = XmlReader.Create(documentStream, settings)) {
+      using(XmlReader reader = XmlReader.Create(documentStream, settings)) {
         var document = XDocument.Load(reader, LoadOptions.None);
 
         // Create a schema set because the Validate() method only accepts