diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index cf74344fd..4355f8a6c 100644
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -120,7 +120,7 @@ void telnet_log_callback(void *priv, const char *file, int line,
 
 	/* clear the command line */
 	telnet_write(connection, "\r", 1);
-	for (i = strlen(t_con->prompt) + t_con->line_size; i>0; i-=16)
+	for (i = strlen(t_con->prompt) + t_con->line_size; i>0; i -= 16)
 		telnet_write(connection, "                ", i>16 ? 16 : i);
 	telnet_write(connection, "\r", 1);
 
diff --git a/src/target/image.c b/src/target/image.c
index 286a22133..d6042e46b 100644
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -1022,7 +1022,7 @@ int image_calculate_checksum(uint8_t* buffer, uint32_t nbytes, uint32_t* checksu
 		{
 			run=32768;
 		}
-		nbytes-=run;
+		nbytes -= run;
 		while (run--)
 		{
 			/* as per gdb */
diff --git a/src/target/target.c b/src/target/target.c
index 159464502..7c2f8c5a3 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -2286,12 +2286,12 @@ static int handle_load_image_command(struct command_context_s *cmd_ctx, char *cm
 			{
 				/* clip addresses below */
 				offset+=min_address-image.sections[i].base_address;
-				length-=offset;
+				length -= offset;
 			}
 
 			if (image.sections[i].base_address+buf_cnt>max_address)
 			{
-				length-=(image.sections[i].base_address+buf_cnt)-max_address;
+				length -= (image.sections[i].base_address+buf_cnt)-max_address;
 			}
 
 			if ((retval = target_write_buffer(target, image.sections[i].base_address+offset, length, buffer+offset)) != ERROR_OK)
@@ -4467,12 +4467,12 @@ static int handle_fast_load_image_command(struct command_context_s *cmd_ctx, cha
 			{
 				/* clip addresses below */
 				offset+=min_address-image.sections[i].base_address;
-				length-=offset;
+				length -= offset;
 			}
 
 			if (image.sections[i].base_address+buf_cnt>max_address)
 			{
-				length-=(image.sections[i].base_address+buf_cnt)-max_address;
+				length -= (image.sections[i].base_address+buf_cnt)-max_address;
 			}
 
 			fastload[i].address=image.sections[i].base_address+offset;