diff --git a/src/client.c b/src/client.c
index f2ce0e5..9726040 100644
--- a/src/client.c
+++ b/src/client.c
@@ -206,7 +206,7 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
         char *if_modified_since = http_get_header_field(&req.hdr, "If-Modified-Since");
         char *if_none_match = http_get_header_field(&req.hdr, "If-None-Match");
         if ((if_none_match != NULL && strstr(if_none_match, uri.meta->etag) == NULL) || (accept_if_modified_since &&
-                                                                                         if_modified_since != NULL && strcmp(if_modified_since, last_modified) == 0)) {
+             if_modified_since != NULL && strcmp(if_modified_since, last_modified) == 0)) {
             res.status = http_get_status(304);
             goto respond;
         }
diff --git a/src/uri.c b/src/uri.c
index c05b43e..5d3f526 100644
--- a/src/uri.c
+++ b/src/uri.c
@@ -75,7 +75,7 @@ int uri_init(http_uri *uri, const char *webroot, const char *uri_str, int dir_mo
     } else {
         strcpy(uri->pathinfo, "");
     }
-    while (1) {
+    while (dir_mode == URI_DIR_MODE_INFO) {
         sprintf(buf0, "%s%s", uri->webroot, uri->path);
         sprintf(buf1, "%s.php", buf0);
         sprintf(buf2, "%s.html", buf0);