diff --git a/etc/openstack_deploy/env.d/extra_container.yml.example b/etc/openstack_deploy/env.d/extra_container.yml.example
index 88a73b1f5c..8c0e9dbddc 100644
--- a/etc/openstack_deploy/env.d/extra_container.yml.example
+++ b/etc/openstack_deploy/env.d/extra_container.yml.example
@@ -1,17 +1,17 @@
 ---
 # Copyright 2014, Rackspace US, Inc.
-# #
-# # Licensed under the Apache License, Version 2.0 (the "License");
-# # you may not use this file except in compliance with the License.
-# # You may obtain a copy of the License at
-# #
-# #     http://www.apache.org/licenses/LICENSE-2.0
-# #
-# # Unless required by applicable law or agreed to in writing, software
-# # distributed under the License is distributed on an "AS IS" BASIS,
-# # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# # See the License for the specific language governing permissions and
-# # limitations under the License.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 component_skel:
   example_api:
diff --git a/etc/openstack_deploy/user_variables.yml b/etc/openstack_deploy/user_variables.yml
index da81c95799..9cbfd1bf4e 100644
--- a/etc/openstack_deploy/user_variables.yml
+++ b/etc/openstack_deploy/user_variables.yml
@@ -74,15 +74,15 @@ debug: false
 # By default, your deployment host will connect to one of the mons defined above to
 # obtain a copy of your cluster's ceph.conf.  If you prefer, uncomment ceph_conf_file
 # and customise to avoid ceph.conf being copied from a mon.
-#ceph_conf_file: |
-#  [global]
-#  fsid = 00000000-1111-2222-3333-444444444444
-#  mon_initial_members = mon1.example.local,mon2.example.local,mon3.example.local
-#  mon_host = 10.16.5.40,10.16.5.41,10.16.5.42
-#  # optionally, you can use this construct to avoid defining this list twice:
-#  # mon_host = {{ ceph_mons|join(',') }}
-#  auth_cluster_required = cephx
-#  auth_service_required = cephx
+# ceph_conf_file: |
+#   [global]
+#   fsid = 00000000-1111-2222-3333-444444444444
+#   mon_initial_members = mon1.example.local,mon2.example.local,mon3.example.local
+#   mon_host = 10.16.5.40,10.16.5.41,10.16.5.42
+#   # optionally, you can use this construct to avoid defining this list twice:
+#   # mon_host = {{ ceph_mons|join(',') }}
+#   auth_cluster_required = cephx
+#   auth_service_required = cephx
 
 
 # By default, openstack-ansible configures all OpenStack services to talk to
diff --git a/scripts/gen-config.py b/scripts/gen-config.py
index f2aea94e05..64f47dbce2 100755
--- a/scripts/gen-config.py
+++ b/scripts/gen-config.py
@@ -19,7 +19,7 @@ import argparse
 import os
 import sys
 
-from osa_toolki import tools
+from osa_toolkit import tools
 
 
 def args(arg_list):
diff --git a/tests/test_manage.py b/tests/test_manage.py
index 584b618b77..f7591892a2 100644
--- a/tests/test_manage.py
+++ b/tests/test_manage.py
@@ -93,7 +93,7 @@ class TestRemoveIpfunction(unittest.TestCase):
         mi.remove_inventory_item("log_hosts", inventory)
         mi.remove_inventory_item("log_hosts", inventory, TARGET_DIR)
 
-        # No make sure it's gone
+        # Now make sure it's gone
         self.assertIn('log_hosts', inventory)
 
     def test_metal_ips_kept(self):