diff --git a/encfs/MemoryPool.cpp b/encfs/MemoryPool.cpp
index ff28056..29a9daf 100644
--- a/encfs/MemoryPool.cpp
+++ b/encfs/MemoryPool.cpp
@@ -33,7 +33,7 @@
 
 #include <openssl/buffer.h>
 
-#define BLOCKDATA(BLOCK) (unsigned char *)BLOCK->data->data
+#define BLOCKDATA(BLOCK) (unsigned char *)(BLOCK)->data->data
 
 namespace encfs {
 
diff --git a/encfs/readpassphrase.cpp b/encfs/readpassphrase.cpp
index 2e5913c..d9d9319 100644
--- a/encfs/readpassphrase.cpp
+++ b/encfs/readpassphrase.cpp
@@ -116,8 +116,9 @@ restart:
       term.c_lflag &= ~(ECHO | ECHONL);
     }
 #ifdef VSTATUS
-    if (term.c_cc[VSTATUS] != _POSIX_VDISABLE)
+    if (term.c_cc[VSTATUS] != _POSIX_VDISABLE) {
       term.c_cc[VSTATUS] = _POSIX_VDISABLE;
+    }
 #endif
     (void)tcsetattr(input, _T_FLUSH, &term);
   } else {