diff --git a/read_json.cpp b/read_json.cpp
index 842b9ab8..b5343140 100644
--- a/read_json.cpp
+++ b/read_json.cpp
@@ -53,7 +53,7 @@ void parse_geometry(int t, json_object *j, drawvec &out, int op, const char *fna
 		size_t i;
 		for (i = 0; i < j->length; i++) {
 			if (within == GEOM_POINT) {
-				if (i == 0 || mb_geometry[t] == GEOM_MULTIPOINT) {
+				if (i == 0 || mb_geometry[t] == VT_POINT) {
 					op = VT_MOVETO;
 				} else {
 					op = VT_LINETO;
@@ -80,7 +80,6 @@ void parse_geometry(int t, json_object *j, drawvec &out, int op, const char *fna
 				}
 			}
 
-			draw d(op, x, y);
 			out.push_back(draw(op, x, y));
 		} else {
 			fprintf(stderr, "%s:%d: malformed point\n", fname, line);
diff --git a/serial.cpp b/serial.cpp
index 50951c6a..6599af58 100644
--- a/serial.cpp
+++ b/serial.cpp
@@ -355,7 +355,7 @@ static long long scale_geometry(struct serialization_state *sst, long long *bbox
 			}
 
 			if (!*(sst->initialized)) {
-				if (x < 0 || x >= (1LL << 32) || y < 0 || y >= (1LL < 32)) {
+				if (x < 0 || x >= (1LL << 32) || y < 0 || y >= (1LL << 32)) {
 					*(sst->initial_x) = 1LL << 31;
 					*(sst->initial_y) = 1LL << 31;
 				} else {