diff --git a/load.c b/load.c
index 186080b..fdcf144 100644
--- a/load.c
+++ b/load.c
@@ -210,7 +210,6 @@ static int init_swap_reader(struct swap_reader *handle, int fd, loff_t start,
  */
 static void find_next_image_page(struct swap_reader *handle)
 {
-	struct extent ext;
 	int error;
 
 	handle->cur_offset += page_size;
@@ -300,9 +299,8 @@ static ssize_t load_buffer(struct swap_reader *handle)
 		if (error)
 			return 0;
 		size = cnt;
-		goto Checksum;
 	}
-#endif
+#else
 	dst = handle->buffer;
 	size = 0;
 	while (size < buffer_size && handle->total_size > 0) {
@@ -312,8 +310,8 @@ static ssize_t load_buffer(struct swap_reader *handle)
 		size += page_size;
 		dst += page_size;
 	}
+#endif
 
- Checksum:
 	if (verify_checksum)
 		md5_process_block(handle->buffer, size, &handle->ctx);
 
@@ -332,7 +330,7 @@ static int load_image(struct swap_reader *handle, int dev,
 	unsigned int m, n;
 	ssize_t buf_size;
 	ssize_t ret;
-	void *buf;
+	void *buf = 0;
 	int error = 0;
 	char message[SPLASH_GENERIC_MESSAGE_SIZE];
 
@@ -571,7 +569,8 @@ int read_or_verify(int dev, int fd, struct image_header_info *header,
                    loff_t start, int verify, int test)
 {
 	static struct swap_reader handle;
-	static unsigned char orig_checksum[16], checksum[16], csum_buf[48];
+	static unsigned char orig_checksum[16], checksum[16];
+	static char csum_buf[48];
 	int error = 0, test_mode = (verify || test);
 
 	error = read_page(fd, header, start);