diff --git a/geobuf.cpp b/geobuf.cpp
index e5f0b66d..d83630fd 100644
--- a/geobuf.cpp
+++ b/geobuf.cpp
@@ -204,7 +204,7 @@ std::vector<drawvec_type> readGeometry(protozero::pbf_reader &pbf, size_t dim, d
 	std::vector<drawvec_type> ret;
 	std::vector<long long> coords;
 	std::vector<int> lengths;
-	int type;
+	int type = -1;
 
 	while (pbf.next()) {
 		switch (pbf.tag()) {
diff --git a/jsonpull/jsonpull.c b/jsonpull/jsonpull.c
index 78e6472a..c214e68e 100644
--- a/jsonpull/jsonpull.c
+++ b/jsonpull/jsonpull.c
@@ -710,12 +710,14 @@ void json_free(json_object *o) {
 
 static void json_disconnect_parser(json_object *o) {
 	if (o->type == JSON_HASH) {
-		for (size_t i = 0; i < o->length; i++) {
+		size_t i;
+		for (i = 0; i < o->length; i++) {
 			json_disconnect_parser(o->keys[i]);
 			json_disconnect_parser(o->values[i]);
 		}
 	} else if (o->type == JSON_ARRAY) {
-		for (size_t i = 0; i < o->length; i++) {
+		size_t i;
+		for (i = 0; i < o->length; i++) {
 			json_disconnect_parser(o->array[i]);
 		}
 	}