diff --git a/src/cpp-utils/system/clock_gettime.h b/src/cpp-utils/system/clock_gettime.h
index 7c7d9765..42ce5775 100644
--- a/src/cpp-utils/system/clock_gettime.h
+++ b/src/cpp-utils/system/clock_gettime.h
@@ -2,11 +2,11 @@
 #ifndef MESSMER_CPPUTILS_SYSTEM_CLOCKGETTIME_H
 #define MESSMER_CPPUTILS_SYSTEM_CLOCKGETTIME_H
 
-// Implements clock_gettime for Mac OS X (where it is not implemented by in the standard library)
+// Implements clock_gettime for Mac OS X before 10.12 (where it is not implemented by in the standard library)
 // Source: http://stackoverflow.com/a/9781275/829568
 // Caution: The returned value is less precise than the returned value from a linux clock_gettime would be.
 
-#ifdef __MACH__
+#if defined(__MACH__) && !defined(CLOCK_REALTIME)
 #include <sys/time.h>
 #define CLOCK_REALTIME 0
 inline int clock_gettime(int /*clk_id*/, struct timespec *result) {
diff --git a/src/cryfs-cli/program_options/Parser.cpp b/src/cryfs-cli/program_options/Parser.cpp
index c5833cf0..0391f20b 100644
--- a/src/cryfs-cli/program_options/Parser.cpp
+++ b/src/cryfs-cli/program_options/Parser.cpp
@@ -2,11 +2,13 @@
 #include "utils.h"
 #include <iostream>
 #include <boost/optional.hpp>
+#include <cryfs/config/CryConfigConsole.h>
 #include <cryfs-cli/Environment.h>
 
 namespace po = boost::program_options;
 namespace bf = boost::filesystem;
 using namespace cryfs::program_options;
+using cryfs::CryConfigConsole;
 using std::pair;
 using std::vector;
 using std::cerr;
@@ -118,12 +120,16 @@ vector<const char*> Parser::_to_const_char_vector(const vector<string> &options)
 
 void Parser::_addAllowedOptions(po::options_description *desc) {
     po::options_description options("Allowed options");
+    string cipher_description = "Cipher to use for encryption. See possible values by calling cryfs with --show-ciphers. Default: ";
+    cipher_description += CryConfigConsole::DEFAULT_CIPHER;
+    string blocksize_description = "The block size used when storing ciphertext blocks (in bytes). Default: ";
+    blocksize_description += std::to_string(CryConfigConsole::DEFAULT_BLOCKSIZE_BYTES);
     options.add_options()
             ("help,h", "show help message")
             ("config,c", po::value<string>(), "Configuration file")
             ("foreground,f", "Run CryFS in foreground.")
-            ("cipher", po::value<string>(), "Cipher to use for encryption. See possible values by calling cryfs with --show-ciphers.")
-            ("blocksize", po::value<uint32_t>(), "The block size used when storing ciphertext blocks (in bytes).")
+            ("cipher", po::value<string>(), cipher_description.c_str())
+            ("blocksize", po::value<uint32_t>(), blocksize_description.c_str())
             ("show-ciphers", "Show list of supported ciphers.")
             ("unmount-idle", po::value<double>(), "Automatically unmount after specified number of idle minutes.")
             ("logfile", po::value<string>(), "Specify the file to write log messages to. If this is not specified, log messages will go to stdout, or syslog if CryFS is running in the background.")
diff --git a/src/cryfs/filesystem/fsblobstore/utils/DirEntry.h b/src/cryfs/filesystem/fsblobstore/utils/DirEntry.h
index 2ff8b617..16a000a1 100644
--- a/src/cryfs/filesystem/fsblobstore/utils/DirEntry.h
+++ b/src/cryfs/filesystem/fsblobstore/utils/DirEntry.h
@@ -5,6 +5,7 @@
 #include <blockstore/utils/Key.h>
 #include <fspp/fs_interface/Dir.h>
 #include <cpp-utils/system/time.h>
+#include <sys/stat.h>
 
 // TODO Implement (and test) atime, noatime, strictatime, relatime mount options