diff --git a/library/ipaextras.py b/library/ipaextras.py
index b6792949..5b315312 100644
--- a/library/ipaextras.py
+++ b/library/ipaextras.py
@@ -191,8 +191,11 @@ def main():
         configure_firefox(options, statestore, domain)
 
     if not no_nisdomain:
-        configure_nisdomain(
-            options=options, domain=domain, statestore=statestore)
+        if NUM_VERSION < 40500:
+            configure_nisdomain(options=options, domain=domain)
+        else:
+            configure_nisdomain(options=options, domain=domain,
+                                statestore=statestore)
 
     # Cleanup: Remove CCACHE_FILE
     try:
diff --git a/library/ipanss.py b/library/ipanss.py
index 31fdf80e..09b37fe5 100644
--- a/library/ipanss.py
+++ b/library/ipanss.py
@@ -215,7 +215,10 @@ def main():
     # (if installed)
     nscd = services.knownservices.nscd
     if nscd.is_installed():
-        save_state(nscd, statestore)
+        if NUM_VERSION < 40500:
+            save_state(nscd)
+        else:
+            save_state(nscd, statestore)
 
         try:
             nscd_service_action = 'stop'
@@ -232,7 +235,10 @@ def main():
 
     nslcd = services.knownservices.nslcd
     if nslcd.is_installed():
-        save_state(nslcd, statestore)
+        if NUM_VERSION < 40500:
+            save_state(nslcd)
+        else:
+            save_state(nslcd, statestore)
 
     ##########################################################################