diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/ProductDerivations.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/ProductDerivations.java
index 7674119f3..4cdc99fd9 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/ProductDerivations.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/ProductDerivations.java
@@ -36,7 +36,8 @@ public class ProductDerivations {
     private static final ProductDerivation[] _derivations;
 
     static {
-        Class[] pdcls = Services.getImplementorClasses(ProductDerivation.class);
+        Class[] pdcls = Services.getImplementorClasses(ProductDerivation.class,
+          ProductDerivations.class.getClassLoader());
         List derivations = new ArrayList(pdcls.length);
         for (int i = 0; i < pdcls.length; i++) {
             try {
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
index 79a33df10..ec647d96f 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
@@ -2617,7 +2617,7 @@ public class PCEnhancer {
 		if (_auxEnhancers == null) {
 		    try {
                 Class[] classes = Services.getImplementorClasses
-                    (AuxiliaryEnhancer.class);
+                    (AuxiliaryEnhancer.class, getClass().getClassLoader());
                 _auxEnhancers = new AuxiliaryEnhancer[classes.length];
                 for (int i = 0; i < _auxEnhancers.length; i++)
                     _auxEnhancers[i] = (AuxiliaryEnhancer) classes[i].
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.java
index 9764c1739..c0889210b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.java
@@ -34,7 +34,7 @@ public class QueryLanguages {
     static {
         // Load and cache all the query languages available in the system.
         Class[] classes = Services.getImplementorClasses(
-            ExpressionParser.class);
+            ExpressionParser.class, QueryLanguages.class.getClassLoader());
         for (int i = 0; i < classes.length; i++) {
             ExpressionParser ep;
             try {
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java
index 94e1f3e28..d21378312 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java
@@ -42,7 +42,7 @@ import org.apache.openjpa.lib.util.Localizer;
  * &lt;/mytask&rt;
  * </code> 
  *
- * The defailt configuration for the system will be used if the
+ * The default configuration for the system will be used if the
  * <code>&lt;config&rt;</code> subtask is excluded.
  *
  * @nojavadoc