diff --git a/address.c b/address.c
index 1e5587611c..4d63f8ee3a 100644
--- a/address.c
+++ b/address.c
@@ -45,12 +45,12 @@ bool address_check_prefix(const uint8_t *addr, uint32_t address_type)
 		return address_type == (uint32_t)(addr[0]);
 	}
 	if (address_type <= 0xFFFF) {
-		return address_type == ((uint32_t)(addr[0] << 8) | (uint32_t)(addr[1]));
+		return address_type == (((uint32_t) addr[0] << 8) | ((uint32_t) addr[1]));
 	}
 	if (address_type <= 0xFFFFFF) {
-		return address_type == ((uint32_t)(addr[0] << 16) | (uint32_t)(addr[1] << 8) | (uint32_t)(addr[2]));
+		return address_type == (((uint32_t) addr[0] << 16) | ((uint32_t) addr[1] << 8) | ((uint32_t) addr[2]));
 	}
-	return address_type == ((uint32_t)(addr[0] << 24) | (uint32_t)(addr[1] << 16) | (uint32_t)(addr[2] << 8) | (uint32_t)(addr[3]));
+	return address_type == (((uint32_t) addr[0] << 24) | ((uint32_t) addr[1] << 16) | ((uint32_t) addr[2] << 8) | ((uint32_t) addr[3]));
 }
 
 #if USE_ETHEREUM
diff --git a/bignum.c b/bignum.c
index 27e361d670..00600221d3 100644
--- a/bignum.c
+++ b/bignum.c
@@ -111,13 +111,13 @@ void bn_read_be(const uint8_t *in_number, bignum256 *out_number)
 void bn_write_be(const bignum256 *in_number, uint8_t *out_number)
 {
 	int i;
-	uint32_t temp = in_number->val[8] << 16;
+	uint32_t temp = in_number->val[8];
 	for (i = 0; i < 8; i++) {
-		// invariant: temp = (in_number >> 30*(8-i)) << (16 + 2i)
+		// invariant: temp = (in_number >> 30*(8-i))
 		uint32_t limb = in_number->val[7 - i];
-		temp |= limb >> (14 - 2*i);
+		temp = (temp << (16 + 2*i)) | (limb >> (14 - 2*i));
 		write_be(out_number + i * 4, temp);
-		temp = limb << (18 + 2*i);
+		temp = limb;
 	}
 }
 
@@ -146,13 +146,13 @@ void bn_read_le(const uint8_t *in_number, bignum256 *out_number)
 void bn_write_le(const bignum256 *in_number, uint8_t *out_number)
 {
 	int i;
-	uint32_t temp = in_number->val[8] << 16;
+	uint32_t temp = in_number->val[8];
 	for (i = 0; i < 8; i++) {
-		// invariant: temp = (in_number >> 30*(8-i)) << (16 + 2i)
+		// invariant: temp = (in_number >> 30*(8-i))
 		uint32_t limb = in_number->val[7 - i];
-		temp |= limb >> (14 - 2*i);
+		temp = (temp << (16 + 2*i)) | (limb >> (14 - 2*i));
 		write_le(out_number + (7 - i) * 4, temp);
-		temp = limb << (18 + 2*i);
+		temp = limb;
 	}
 }
 
@@ -840,7 +840,7 @@ void bn_inverse(bignum256 *x, const bignum256 *prime)
 		//   s + factor*prime mod 2^k == 0
 		// i.e. factor = s * -1/prime mod 2^k.
 		// Then compute s + factor*prime and shift right by k bits.
-		uint32_t mask = (1 << k) - 1;
+		uint32_t mask = (1u << k) - 1;
 		uint32_t factor = (inverse * us.a[8]) & mask;
 		temp = (us.a[8] + (uint64_t) pp[0] * factor) >> k;
 		assert(((us.a[8] + pp[0] * factor) & mask) == 0);
diff --git a/bip32.c b/bip32.c
index fbccb97171..ea9005bc5b 100644
--- a/bip32.c
+++ b/bip32.c
@@ -168,7 +168,7 @@ uint32_t hdnode_fingerprint(HDNode *node)
 	hdnode_fill_public_key(node);
 	hasher_Raw(node->curve->hasher_type, node->public_key, 33, digest);
 	ripemd160(digest, 32, digest);
-	fingerprint = (digest[0] << 24) + (digest[1] << 16) + (digest[2] << 8) + digest[3];
+	fingerprint = ((uint32_t) digest[0] << 24) + (digest[1] << 16) + (digest[2] << 8) + digest[3];
 	memzero(digest, sizeof(digest));
 	return fingerprint;
 }
diff --git a/nem.c b/nem.c
index d5faff0088..8a4b7c52ab 100644
--- a/nem.c
+++ b/nem.c
@@ -214,7 +214,7 @@ bool nem_transaction_create_transfer(nem_transaction_ctx *ctx,
 
 	bool ret = nem_transaction_write_common(ctx,
 		NEM_TRANSACTION_TYPE_TRANSFER,
-		network << 24 | (mosaics ? 2 : 1),
+		(uint32_t) network << 24 | (mosaics ? 2 : 1),
 		timestamp,
 		signer,
 		fee,
@@ -292,7 +292,7 @@ bool nem_transaction_create_multisig(nem_transaction_ctx *ctx,
 
 	bool ret = nem_transaction_write_common(ctx,
 		NEM_TRANSACTION_TYPE_MULTISIG,
-		network << 24 | 1,
+		(uint32_t) network << 24 | 1,
 		timestamp,
 		signer,
 		fee,
@@ -321,7 +321,7 @@ bool nem_transaction_create_multisig_signature(nem_transaction_ctx *ctx,
 
 	bool ret = nem_transaction_write_common(ctx,
 		NEM_TRANSACTION_TYPE_MULTISIG_SIGNATURE,
-		network << 24 | 1,
+		(uint32_t) network << 24 | 1,
 		timestamp,
 		signer,
 		fee,
@@ -361,7 +361,7 @@ bool nem_transaction_create_provision_namespace(nem_transaction_ctx *ctx,
 
 	bool ret = nem_transaction_write_common(ctx,
 		NEM_TRANSACTION_TYPE_PROVISION_NAMESPACE,
-		network << 24 | 1,
+		(uint32_t) network << 24 | 1,
 		timestamp,
 		signer,
 		fee,
@@ -420,7 +420,7 @@ bool nem_transaction_create_mosaic_creation(nem_transaction_ctx *ctx,
 
 	bool ret = nem_transaction_write_common(ctx,
 		NEM_TRANSACTION_TYPE_MOSAIC_CREATION,
-		network << 24 | 1,
+		(uint32_t) network << 24 | 1,
 		timestamp,
 		signer,
 		fee,
@@ -506,7 +506,7 @@ bool nem_transaction_create_mosaic_supply_change(nem_transaction_ctx *ctx,
 
 	bool ret = nem_transaction_write_common(ctx,
 		NEM_TRANSACTION_TYPE_MOSAIC_SUPPLY_CHANGE,
-		network << 24 | 1,
+		(uint32_t) network << 24 | 1,
 		timestamp,
 		signer,
 		fee,
@@ -544,7 +544,7 @@ bool nem_transaction_create_aggregate_modification(nem_transaction_ctx *ctx,
 
 	bool ret = nem_transaction_write_common(ctx,
 		NEM_TRANSACTION_TYPE_AGGREGATE_MODIFICATION,
-		network << 24 | (relative_change ? 2 : 1),
+		(uint32_t) network << 24 | (relative_change ? 2 : 1),
 		timestamp,
 		signer,
 		fee,
@@ -600,7 +600,7 @@ bool nem_transaction_create_importance_transfer(nem_transaction_ctx *ctx,
 
 	bool ret = nem_transaction_write_common(ctx,
 		NEM_TRANSACTION_TYPE_IMPORTANCE_TRANSFER,
-		network << 24 | 1,
+		(uint32_t) network << 24 | 1,
 		timestamp,
 		signer,
 		fee,
diff --git a/rand.c b/rand.c
index 0b5c485777..4ec8ab2a67 100644
--- a/rand.c
+++ b/rand.c
@@ -45,7 +45,7 @@ uint32_t random32(void)
 		srand((unsigned)time(NULL));
 		initialized = 1;
 	}
-	return ((rand() % 0xFF) | ((rand() % 0xFF) << 8) | ((rand() % 0xFF) << 16) | ((rand() % 0xFF) << 24));
+	return ((rand() & 0xFF) | ((rand() & 0xFF) << 8) | ((rand() & 0xFF) << 16) | ((uint32_t) (rand() & 0xFF) << 24));
 }
 
 #endif /* RAND_PLATFORM_INDEPENDENT */
diff --git a/test_check.c b/test_check.c
index 6c8fa810aa..728f392f07 100644
--- a/test_check.c
+++ b/test_check.c
@@ -3028,7 +3028,7 @@ static void test_codepoints_curve(const ecdsa_curve *curve) {
 	for (i = 0; i < 64; i++) {
 		for (j = 0; j < 8; j++) {
 			bn_zero(&a);
-			a.val[(4*i)/30] = (2*j+1) << (4*i % 30);
+			a.val[(4*i)/30] = (uint32_t) (2*j+1) << (4*i % 30);
 			bn_normalize(&a);
 			// note that this is not a trivial test.  We add 64 curve
 			// points in the table to get that particular curve point.