diff --git a/boom/_boom.py b/boom/_boom.py
index d8fff54..4a84b78 100644
--- a/boom/_boom.py
+++ b/boom/_boom.py
@@ -629,7 +629,7 @@ class Selection(object):
                       os_version_id=args.os_version_id,
                       os_options=args.os_options,
                       os_uname_pattern=args.uname_pattern,
-                      host_id=args.host_id)
+                      host_id=args.host_profile)
 
         _log_debug("Initialised %s from arguments" % repr(s))
         return s
diff --git a/boom/command.py b/boom/command.py
index 5a50f98..a113c21 100644
--- a/boom/command.py
+++ b/boom/command.py
@@ -908,7 +908,7 @@ def _uname_heuristic(name, version_id):
     }
 
     if name in _name_to_uname:
-        return "%s%s" % (_name_to_uname[name], version_id.replace(".", "_"))
+        return "%s%s" % (_name_to_uname[name], version_id)
     return None
 
 
@@ -2787,7 +2787,9 @@ def main(args):
                         help="Take os-release values from the running host",
                         action="store_true")
     parser.add_argument("-P", "--host-profile", metavar="PROFILE", type=str,
-                        help="A boom host profile identifier", dest="host_id")
+                        help="A boom host profile identifier")
+    parser.add_argument("--host-id", metavar="HOSTID", type=str,
+                        help="A host profile identifier")
     parser.add_argument("--host-name", metavar="HOSTNAME", type=str,
                         help="The host name associated with a host profile")
     parser.add_argument("-i", "--initrd", metavar="IMG", type=str,
diff --git a/etc/default/boom b/etc/default/boom
old mode 100644
new mode 100755
index 451cb37..cd5f772
--- a/etc/default/boom
+++ b/etc/default/boom
@@ -1,3 +1,3 @@
-BOOM_USE_SUBMENU="no"
+BOOM_USE_SUBMENU="yes"
 BOOM_SUBMENU_NAME="Snapshots"
-BOOM_ENABLE_GRUB="no"
+BOOM_ENABLE_GRUB="yes"
diff --git a/examples/entries/611f38fd887d41dea7eb3403b2730a76-12ce4b8-4.1.1-100.fc24.conf b/examples/entries/611f38fd887d41dea7eb3403b2730a76-12ce4b8-4.1.1-100.fc24.conf
new file mode 120000
index 0000000..70b5b3f
--- /dev/null
+++ b/examples/entries/611f38fd887d41dea7eb3403b2730a76-12ce4b8-4.1.1-100.fc24.conf
@@ -0,0 +1 @@
+../../tests/loader/entries/611f38fd887d41dea7eb3403b2730a76-12ce4b8-4.1.1-100.fc24.conf
\ No newline at end of file
diff --git a/examples/entries/611f38fd887d41dea7eb3403b2730a76-f2ebf21-3.10-23.el7.conf b/examples/entries/611f38fd887d41dea7eb3403b2730a76-f2ebf21-3.10-23.el7.conf
new file mode 120000
index 0000000..4a62f7d
--- /dev/null
+++ b/examples/entries/611f38fd887d41dea7eb3403b2730a76-f2ebf21-3.10-23.el7.conf
@@ -0,0 +1 @@
+../../tests/loader/entries/611f38fd887d41dea7eb3403b2730a76-f2ebf21-3.10-23.el7.conf
\ No newline at end of file
diff --git a/man/man8/boom.8 b/man/man8/boom.8
index cfc736a..28bad24 100644
--- a/man/man8/boom.8
+++ b/man/man8/boom.8
@@ -1114,8 +1114,8 @@ describing the properties of the configured host profiles.
 
 The list of fields to display is given with \fB--options\fP as a comma
 separated list of field names. To obtain a list of available fields run
-\&'\fBboom host list -o help\fP'. If the list of fields begins with the
-\&'\fB+\fP' character the specified fields are appended to the default
+'\fBboom host list -o help\fP'. If the list of fields begins with the
+'\fB+\fP' character the specified fields are appended to the default
 field list. Otherwise the given list of fields replaces the default set
 of report fields.
 
diff --git a/tests/bootloader_configs/boom_off/etc/default/boom b/tests/bootloader_configs/boom_off/etc/default/boom
old mode 100644
new mode 100755
diff --git a/tests/bootloader_configs/boom_on/etc/default/boom b/tests/bootloader_configs/boom_on/etc/default/boom
old mode 100644
new mode 100755
diff --git a/tests/bootloader_configs/no_grub_d/etc/default/boom b/tests/bootloader_configs/no_grub_d/etc/default/boom
old mode 100644
new mode 100755