diff --git a/src/clipboard.c b/src/clipboard.c
index 5a3a02d2..dbd8c9bf 100644
--- a/src/clipboard.c
+++ b/src/clipboard.c
@@ -214,9 +214,10 @@ clipboard_client_create(struct clipboard_source *source, int fd)
 	struct wl_event_loop *loop =
 		wl_display_get_event_loop(seat->compositor->wl_display);
 
-	client = malloc(sizeof *client);
+	client = zalloc(sizeof *client);
+	if (client == NULL)
+		return;
 
-	client->offset = 0;
 	client->source = source;
 	source->refcount++;
 	client->event_source =
diff --git a/src/screenshooter.c b/src/screenshooter.c
index cafbf107..6246cda4 100644
--- a/src/screenshooter.c
+++ b/src/screenshooter.c
@@ -481,7 +481,7 @@ weston_recorder_create(struct weston_output *output, const char *filename)
 
 	do_yflip = !!(compositor->capabilities & WESTON_CAP_CAPTURE_YFLIP);
 
-	recorder = malloc(sizeof *recorder);
+	recorder = zalloc(sizeof *recorder);
 	if (recorder == NULL) {
 		weston_log("%s: out of memory\n", __func__);
 		return;
@@ -491,9 +491,6 @@ weston_recorder_create(struct weston_output *output, const char *filename)
 	size = stride * 4 * output->current_mode->height;
 	recorder->frame = zalloc(size);
 	recorder->rect = malloc(size);
-	recorder->total = 0;
-	recorder->count = 0;
-	recorder->destroying = 0;
 	recorder->output = output;
 
 	if ((recorder->frame == NULL) || (recorder->rect == NULL)) {
@@ -502,9 +499,7 @@ weston_recorder_create(struct weston_output *output, const char *filename)
 		return;
 	}
 
-	if (do_yflip)
-		recorder->tmpbuf = NULL;
-	else
+	if (!do_yflip)
 		recorder->tmpbuf = malloc(size);
 
 	header.magic = WCAP_HEADER_MAGIC;