diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py
index 10c8600..e724ee2 100644
--- a/filter_plugins/oo_filters.py
+++ b/filter_plugins/oo_filters.py
@@ -11,6 +11,7 @@ import pdb
 import random
 import re

+from base64 import b64encode
 from collections import Mapping
 # pylint no-name-in-module and import-error disabled here because pylint
 # fails to properly detect the packages when installed in a virtualenv
@@ -673,7 +674,7 @@ def oo_generate_secret(num_bytes):
         raise errors.AnsibleFilterError("|failed expects num_bytes is int")

     secret = os.urandom(num_bytes)
-    return secret.encode('base-64').strip()
+    return b64encode(os.urandom(num_bytes)).decode('utf-8')


 def to_padded_yaml(data, level=0, indent=2, **kw):
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index adeb85c..1498706 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1916,8 +1916,8 @@ class OpenShiftFacts(object):
             self.system_facts = ansible_facts(module, ['hardware', 'network', 'virtual', 'facter'])  # noqa: F405
             for (k, v) in self.system_facts.items():
                 self.system_facts["ansible_%s" % k.replace('-', '_')] = v
-        except UnboundLocalError:
-            # ansible-2.2
+        except (UnboundLocalError, RuntimeError):
+            # ansible-2.2,2.3
             self.system_facts = get_all_facts(module)['ansible_facts']  # noqa: F405

         self.facts = self.generate_facts(local_facts,