diff --git a/include/functions b/include/functions
index 5b211707..38cc46b3 100644
--- a/include/functions
+++ b/include/functions
@@ -2562,14 +2562,18 @@
 
     GetTimestamp() {
         ts=0
-        case "${OS}" in
-            "Linux")
+        # Detect if the implementation of date supports nanoseconds,
+        if [ "${OS}" = "Linux" ]; then
+            current_nanoseconds=$(date "+%N")
+            # Verify if the result of the command is a number
+            if [ -n "$current_nanoseconds" ] && [ "$current_nanoseconds" -eq "$current_nanoseconds" ] 2>/dev/null; then
                 ts=$(date "+%s%N")
-            ;;
-            *)
+            else
                 ts=$(date "+%s")
-            ;;
-        esac
+            fi
+        else
+            ts=$(date "+%s")
+        fi
         echo $ts
     }
 
diff --git a/include/tests_filesystems b/include/tests_filesystems
index 480ba40a..ab6191aa 100644
--- a/include/tests_filesystems
+++ b/include/tests_filesystems
@@ -744,7 +744,7 @@
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Checking locate database"
         FOUND=0
-        LOCATE_DBS="${ROOTDIR}var/lib/mlocate/mlocate.db ${ROOTDIR}var/lib/locate/locatedb ${ROOTDIR}var/lib/locatedb ${ROOTDIR}var/lib/slocate/slocate.db ${ROOTDIR}var/cache/locate/locatedb ${ROOTDIR}var/db/locate.database"
+        LOCATE_DBS="${ROOTDIR}var/cache/locate/locatedb ${ROOTDIR}var/db/locate.database ${ROOTDIR}var/lib/locate/locatedb ${ROOTDIR}var/lib/locatedb ${ROOTDIR}var/lib/mlocate/mlocate.db ${ROOTDIR}var/lib/plocate/plocate.db ${ROOTDIR}var/lib/slocate/slocate.db"
         for FILE in ${LOCATE_DBS}; do
             if [ -f ${FILE} ]; then
                 LogText "Result: locate database found (${FILE})"
diff --git a/include/tests_ssh b/include/tests_ssh
index de3209ee..fb784d83 100644
--- a/include/tests_ssh
+++ b/include/tests_ssh
@@ -135,7 +135,6 @@
         SSHOPS="AllowTcpForwarding:NO,LOCAL,YES:=\
                 ClientAliveCountMax:2,4,16:<\
                 ClientAliveInterval:300,600,900:<\
-                Compression:NO,,YES:=\
                 FingerprintHash:SHA256,MD5,:=\
                 GatewayPorts:NO,,YES:=\
                 IgnoreRhosts:YES,,NO:=\
@@ -158,12 +157,12 @@
         # OpenSSH had some options removed over time. Based on the version we add some additional options to check
         if [ ${OPENSSHD_VERSION_MAJOR} -lt 7 ]; then
             LogText "Result: added additional options for OpenSSH 6.x and lower"
-            SSHOPS="${SSHOPS} UsePrivilegeSeparation:SANDBOX,YES,NO:=  Protocol:2,,1:="
+            SSHOPS="${SSHOPS} Compression:(DELAYED|NO),,YES:= UsePrivilegeSeparation:SANDBOX,YES,NO:=  Protocol:2,,1:="
         elif [ ${OPENSSHD_VERSION_MAJOR} -eq 7 ]; then
             # Protocol 1 support removed (OpenSSH 7.4 and later)
             if [ ${OPENSSHD_VERSION_MINOR} -lt 4 ]; then
                 LogText "Result: added additional options for OpenSSH < 7.4"
-                SSHOPS="${SSHOPS} Protocol:2,,1:="
+                SSHOPS="${SSHOPS} Compression:(DELAYED|NO),,YES:= Protocol:2,,1:="
             fi
             # UsePrivilegedSeparation removed (OpenSSH 7.5 and later)
             if [ ${OPENSSHD_VERSION_MINOR} -lt 5 ]; then