diff --git a/archaius2-core/src/main/java/com/netflix/archaius/config/AbstractConfig.java b/archaius2-core/src/main/java/com/netflix/archaius/config/AbstractConfig.java
index b29f03af..1ee795b7 100644
--- a/archaius2-core/src/main/java/com/netflix/archaius/config/AbstractConfig.java
+++ b/archaius2-core/src/main/java/com/netflix/archaius/config/AbstractConfig.java
@@ -198,6 +198,7 @@ public String getString(String key) {
         }
 
         if (value instanceof String) {
+            // todo: inconsistent with above
             return resolve(value.toString());
         } else {
             return value.toString();
diff --git a/archaius2-core/src/main/java/com/netflix/archaius/config/DefaultCompositeConfig.java b/archaius2-core/src/main/java/com/netflix/archaius/config/DefaultCompositeConfig.java
index 5fb579e1..729187b6 100644
--- a/archaius2-core/src/main/java/com/netflix/archaius/config/DefaultCompositeConfig.java
+++ b/archaius2-core/src/main/java/com/netflix/archaius/config/DefaultCompositeConfig.java
@@ -247,7 +247,7 @@ public synchronized Collection<String> getConfigNames() {
     protected void postConfigAdded(Config child) {
         child.setStrInterpolator(getStrInterpolator());
         child.setDecoder(getDecoder());
-        notifyConfigAdded(child);
+        notifyConfigAdded(this);
         child.addListener(listener);
     }
 
@@ -267,7 +267,7 @@ public synchronized Config internalRemoveConfig(String name) {
         if (child != null) {
             state = state.removeConfig(name);
             child.removeListener(listener);
-            this.notifyConfigRemoved(child);
+            this.notifyConfigRemoved(this);
         }
         return child;
     }