diff --git a/src/remote.c b/src/remote.c
index d072eb9d5..a032f00ad 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -97,7 +97,7 @@ static int get_check_cert(int *out, git_repository *repo)
 	 * most specific to least specific. */
 
 	/* GIT_SSL_NO_VERIFY environment variable */
-	if (val = getenv("GIT_SSL_NO_VERIFY"))
+	if ((val = getenv("GIT_SSL_NO_VERIFY")) != NULL)
 		return git_config_parse_bool(out, val);
 
 	/* http.sslVerify config setting */
@@ -1494,12 +1494,12 @@ int git_remote_rename(
 
 int git_remote_update_fetchhead(git_remote *remote)
 {
-	return remote->update_fetchhead;
+	return (remote->update_fetchhead != 0);
 }
 
 void git_remote_set_update_fetchhead(git_remote *remote, int value)
 {
-	remote->update_fetchhead = value;
+	remote->update_fetchhead = (value != 0);
 }
 
 int git_remote_is_valid_name(
diff --git a/src/remote.h b/src/remote.h
index 33e4d68f8..4164a14b3 100644
--- a/src/remote.h
+++ b/src/remote.h
@@ -28,8 +28,8 @@ struct git_remote {
 	git_transfer_progress stats;
 	unsigned int need_pack;
 	git_remote_autotag_option_t download_tags;
-	unsigned int check_cert;
-	unsigned int update_fetchhead;
+	int check_cert;
+	int update_fetchhead;
 };
 
 const char* git_remote__urlfordirection(struct git_remote *remote, int direction);
diff --git a/tests/online/clone.c b/tests/online/clone.c
index d036a5a47..efc76d958 100644
--- a/tests/online/clone.c
+++ b/tests/online/clone.c
@@ -190,6 +190,8 @@ static int cred_failure_cb(
 	unsigned int allowed_types,
 	void *data)
 {
+	GIT_UNUSED(cred); GIT_UNUSED(url); GIT_UNUSED(username_from_url);
+	GIT_UNUSED(allowed_types); GIT_UNUSED(data);
 	return -1;
 }