diff --git a/CHANGELOG b/CHANGELOG
index 2b068631..2f4fcd93 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,17 @@
 
 ================================================================================
 
+ * 1.6.4 (2014-11-xx)
+
+ New:
+ - Boot loader detection for AIX [BOOT-5102]
+
+ Changes:
+ - Redirect errors when searching for readlink binary
+ - Improved Shellshock test for non-Linux systems [SHLL-6290]
+
+ --
+
  * 1.6.3 (2014-10-14)
 
  New:
diff --git a/include/tests_hardening b/include/tests_hardening
index 1afa3d74..435c2bfe 100644
--- a/include/tests_hardening
+++ b/include/tests_hardening
@@ -33,7 +33,7 @@
           else
             logtext "Result: found installed compiler. See top of logfile which compilers have been found or use grep to filter on 'compiler'"
             Display --indent 4 --text "- Installed compiler(s)" --result "FOUND" --color RED
-            ReportSuggestion ${TEST_NO} "Harden the system by removing unneeded compilers. This can decrease the chance of customized trojans, backdoors and rootkits to be compiled and installed"
+            ReportSuggestion ${TEST_NO} "Harden the system by removing unneeded compilers. This might decrease the chance of customized trojans, backdoors and rootkits to be compiled and installed"
             AddHP 1 3
         fi
     fi
@@ -84,7 +84,7 @@
             # Report suggestion is one or more compilers can be better hardened
             if [ ${HARDEN_COMPILERS_NEEDED} -eq 1 ]; then
                 logtext "Result: at least one compiler could be better hardened by restricting executable access to root or group only"
-                ReportSuggestion ${TEST_NO} "Harden compilers and restrict access to world"
+                ReportSuggestion ${TEST_NO} "Harden compilers like restricting access to root user only"
             fi
 
             #YYY check if compilers have a specific group (like compiler, or NOT root/wheel)
diff --git a/lynis b/lynis
index 22079a07..e9f54c93 100755
--- a/lynis
+++ b/lynis
@@ -363,7 +363,7 @@
         echo "    --version (-V)                : Display version number and quit"
         echo ""
         echo "  ${GREEN}Enterprise options:${NORMAL}"
-        echo "    --plugin-dir \"<path\">         : Define path of available plugins"
+        echo "    --plugin-dir \"<path>\"         : Define path of available plugins"
         echo "    --upload                      : Upload data to central node"
         echo ""