diff --git a/common.c b/common.c
index 7a4b32b..6409769 100644
--- a/common.c
+++ b/common.c
@@ -32,13 +32,11 @@ property_list_t *new_property_list() {
 }
 
 void free_properties(property_list_t *root) {
-	if (root != 0) {
-		property_list_t *tmp = 0;
-		do {
-			tmp = root->pnext;
-			free(root);
-			root = tmp;
-		} while(tmp);
+	property_list_t *tmp = 0;
+	while(root) {
+		tmp = root->pnext;
+		free(root);
+		root = tmp;
 	}
 }
 
diff --git a/sendrecv.go b/sendrecv.go
index c4003c2..d5f938f 100644
--- a/sendrecv.go
+++ b/sendrecv.go
@@ -241,7 +241,7 @@ func (d *Dataset) SendSize(FromName string, flags SendFlags) (size int64, err er
 		errch <- tmpe
 	}()
 
-	r.SetReadDeadline(time.Now().Add(15 * time.Second))
+	r.SetReadDeadline(time.Now().Add(60 * time.Second))
 	var data []byte
 	if data, err = ioutil.ReadAll(r); err != nil {
 		return