diff --git a/core/ini.c b/core/ini.c
index 5fc9fcd0..faed46ca 100644
--- a/core/ini.c
+++ b/core/ini.c
@@ -54,7 +54,7 @@ char *ini_get_key(char *key) {
 	return ptr;
 }
 
-char *ini_get_line(char *ini, off_t size) {
+char *ini_get_line(char *ini, size_t size) {
 
 	off_t i;
 	char *ptr = ini;
diff --git a/core/static.c b/core/static.c
index 5d318061..e263f220 100644
--- a/core/static.c
+++ b/core/static.c
@@ -148,6 +148,7 @@ static time_t parse_http_date(char *date, uint16_t len) {
 
         case 'N':
                 hdtm.tm_mon = 10;
+		break;
 
         case 'D':
                 hdtm.tm_mon = 11;
diff --git a/core/yaml.c b/core/yaml.c
index 14179256..c69c49c4 100644
--- a/core/yaml.c
+++ b/core/yaml.c
@@ -61,7 +61,7 @@ int yaml_get_depth(char *line) {
 	return depth;
 }
 
-char *yaml_get_line(char *yaml, off_t size) {
+char *yaml_get_line(char *yaml, size_t size) {
 
 	off_t i;
 	char *ptr = yaml;
diff --git a/plugins/http/keepalive.c b/plugins/http/keepalive.c
index 1396521a..48164463 100644
--- a/plugins/http/keepalive.c
+++ b/plugins/http/keepalive.c
@@ -152,12 +152,9 @@ int http_response_parse(struct http_session *hr, struct uwsgi_buffer *ub, size_t
 					
 				}
 			}
-			hr->session.can_keepalive = hr->session.can_keepalive;
-		}
-		else if (hr->session.can_keepalive) {
-#else
-		if (hr->session.can_keepalive) {
+		} else
 #endif
+		if (hr->session.can_keepalive) {
 			if (uhttp.auto_chunked) {
 				char cr = buf[len-2];
 				char nl = buf[len-1];