diff --git a/src/crypt.cxx b/src/crypt.cxx
index 4dff898b..53af2956 100644
--- a/src/crypt.cxx
+++ b/src/crypt.cxx
@@ -370,16 +370,16 @@ static char *sha256_crypt_r(const char *key, const char *salt, char *buffer, int
    salt_len = MIN(strcspn(salt, "$"), SALT_LEN_MAX);
    key_len = strlen(key);
 
-   if ((key - (char *) 0) % __alignof__(uint32_t) != 0) {
+   if ((reinterpret_cast<uintptr_t>(key)) % __alignof__(uint32_t) != 0) {
       char *tmp = (char *) alloca(key_len + __alignof__(uint32_t));
       key = copied_key = (char *) memcpy(tmp + __alignof__(uint32_t)
-                                - (tmp - (char *) 0) % __alignof__(uint32_t), key, key_len);
+                                - (reinterpret_cast<uintptr_t>(tmp)) % __alignof__(uint32_t), key, key_len);
    }
 
-   if ((salt - (char *) 0) % __alignof__(uint32_t) != 0) {
+   if ((reinterpret_cast<uintptr_t>(salt)) % __alignof__(uint32_t) != 0) {
       char *tmp = (char *) alloca(salt_len + __alignof__(uint32_t));
       salt = copied_salt = (char *) memcpy(tmp + __alignof__(uint32_t)
-                                  - (tmp - (char *) 0) % __alignof__(uint32_t), salt, salt_len);
+                                  - (reinterpret_cast<uintptr_t>(tmp)) % __alignof__(uint32_t), salt, salt_len);
    }
 
    /* Prepare for the real work.  */
diff --git a/src/elogd.cxx b/src/elogd.cxx
index fdab6d3f..fed41a8a 100755
--- a/src/elogd.cxx
+++ b/src/elogd.cxx
@@ -4666,7 +4666,7 @@ int el_submit_attachment(LOGBOOK *lbs, const char *afilename, const char *buffer
 
 void el_delete_attachment(LOGBOOK *lbs, char *file_name) {
    int i;
-   char str[MAX_PATH_LENGTH], subdir[MAX_PATH_LENGTH];
+   char str[2*MAX_PATH_LENGTH], subdir[MAX_PATH_LENGTH];
 
    strlcpy(str, lbs->data_dir, sizeof(str));
    generate_subdir_name(file_name, subdir, sizeof(subdir));