diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java
index 4e1049055..000a0b251 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java
@@ -74,16 +74,16 @@ public class AutomaticManagedRuntime extends AbstractManagedRuntime
             + "getTransactionManagerImpl", // borland
     };
 
-    private static final ManagedRuntime REGISTRY;
-    private static final WLSManagedRuntime WLS;
-    private static final SunOneManagedRuntime SUNONE;
-    private static final WASManagedRuntime WAS;
-    private static final WASRegistryManagedRuntime WAS_REG;
+    private final ManagedRuntime REGISTRY;
+    private final WLSManagedRuntime WLS;
+    private final SunOneManagedRuntime SUNONE;
+    private final WASManagedRuntime WAS;
+    private final WASRegistryManagedRuntime WAS_REG;
 
     private static Localizer _loc = Localizer.forPackage
         (AutomaticManagedRuntime.class);
 
-    static {
+    public AutomaticManagedRuntime() {
         ManagedRuntime mr = null;
 
         mr = null;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/RegistryManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/RegistryManagedRuntime.java
index eb8350c8c..fcc456153 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/RegistryManagedRuntime.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/RegistryManagedRuntime.java
@@ -101,7 +101,7 @@ public class RegistryManagedRuntime
      *  
      *  @author  Marc Prud'hommeaux
      */
-    public static class TransactionManagerRegistryFacade
+    public class TransactionManagerRegistryFacade
         implements TransactionManager, Transaction {
         private final TransactionSynchronizationRegistry _registry;