diff --git a/cheats.c b/cheats.c
index e69c82eb87..2feb89668a 100644
--- a/cheats.c
+++ b/cheats.c
@@ -161,7 +161,7 @@ static void cheat_manager_load_config(cheat_manager_t *handle, const char *path,
    if (!conf)
       return;
 
-   char *str;
+   char *str = NULL;
    if (!config_get_string(conf, sha256, &str))
    {
       config_file_free(conf);
diff --git a/hash.c b/hash.c
index 216e53e4df..7690e99969 100644
--- a/hash.c
+++ b/hash.c
@@ -163,8 +163,8 @@ static void sha256_final(struct sha256_ctx *p)
    memset(p->in.u8 + p->inlen, 0, 56 - p->inlen);
 
    len = p->len << 3;
-   store32be(p->in.u32 + 14, len >> 32);
-   store32be(p->in.u32 + 15, len);
+   store32be(p->in.u32 + 14, (uint32_t)(len >> 32));
+   store32be(p->in.u32 + 15, (uint32_t)len);
    sha256_block(p);
 }