diff --git a/backend/code49.c b/backend/code49.c
index 74883b08..25115306 100644
--- a/backend/code49.c
+++ b/backend/code49.c
@@ -41,7 +41,7 @@ int code_49(struct zint_symbol *symbol, unsigned char source[], int length)
 
 	if(length > 81) {
 		strcpy(symbol->errtxt, "Input too long");
-		return ERROR_TOO_LONG;
+		return ZERROR_TOO_LONG;
 	}
 	if(symbol->input_mode == GS1_MODE) { gs1 = 1; } else { gs1 = 0; }
 
@@ -49,7 +49,7 @@ int code_49(struct zint_symbol *symbol, unsigned char source[], int length)
 	for(i = 0; i < length; i++) {
 		if(source[i] > 127) {
 			strcpy(symbol->errtxt, "Invalid characters in input data");
-			return ERROR_INVALID_DATA;
+			return ZERROR_INVALID_DATA;
 		}
 		if(gs1 && (source[i] == '['))
 			concat(intermediate, "*"); /* FNC1 */
@@ -180,10 +180,10 @@ int code_49(struct zint_symbol *symbol, unsigned char source[], int length)
 	} while(i < h);
 	
 	switch(codewords[0]) { /* Set starting mode value */
-		case 48: M = 2;
-		case 43: M = 4;
-		case 44: M = 5;
-		default: M = 0;
+		case 48: M = 2; break;
+		case 43: M = 4; break;
+		case 44: M = 5; break;
+		default: M = 0; break;
 	}
 	
 	if(M != 0) {
@@ -195,7 +195,7 @@ int code_49(struct zint_symbol *symbol, unsigned char source[], int length)
 	
 	if(codeword_count > 49) {
 		strcpy(symbol->errtxt, "Input too long");
-		return ERROR_TOO_LONG;
+		return ZERROR_TOO_LONG;
 	}
 	
 	/* Place codewords in code character array (c grid) */