--- src/color.c.orig
+++ src/color.c
@@ -515,7 +515,7 @@ cbtick_callback(
 	    if (axis_array[axis].manual_justify)
 		just = axis_array[axis].label.pos;
 	    write_multiline(x2+offsetx, y3+offsety, text,
-			    just, CENTRE, hrotate,
+			    just, JUST_CENTRE, hrotate,
 			    axis_array[axis].ticdef.font);
 	    if (hrotate)
 		(*term->text_angle)(0);
@@ -526,7 +526,7 @@ cbtick_callback(
 	    if (axis_array[axis].manual_justify)
 		just = axis_array[axis].label.pos;	    
 	    write_multiline(x3+offsetx, y2+offsety, text,
-			    just, CENTRE, 0.0,
+			    just, JUST_CENTRE, 0.0,
 			    axis_array[axis].ticdef.font);
 	}
 	term_apply_lp_properties(&border_lp);	/* border linetype */
--- src/gplt_x11.c.orig
+++ src/gplt_x11.c
@@ -2897,22 +2897,22 @@ exec_cmd(plot_struct *plot, char *command)
 
 		    case PseudoColor:
 			fprintf(stderr, ERROR_NOTICE("PseudoColor"));
-			fprintf(stderr, display_error_text_after);
+			fprintf(stderr, "%s", display_error_text_after);
 			break;
 
 		    case GrayScale:
 			fprintf(stderr, ERROR_NOTICE("GrayScale"));
-			fprintf(stderr, display_error_text_after);
+			fprintf(stderr, "%s", display_error_text_after);
 			break;
 
 		    case StaticColor:
 			fprintf(stderr, ERROR_NOTICE("StaticColor"));
-			fprintf(stderr, display_error_text_after);
+			fprintf(stderr, "%s", display_error_text_after);
 			break;
 
 		    case StaticGray:
 			fprintf(stderr, ERROR_NOTICE("StaticGray"));
-			fprintf(stderr, display_error_text_after);
+			fprintf(stderr, "%s", display_error_text_after);
 			break;
 
 		    case DirectColor:
--- src/graphics.c.orig
+++ src/graphics.c
@@ -1734,7 +1734,7 @@ do_plot(struct curve_points *plots, int pcount)
 	ignore_enhanced(axis_array[FIRST_X_AXIS].label.noenhanced);
 	apply_pm3dcolor(&(axis_array[FIRST_X_AXIS].label.textcolor), t);
 	write_multiline(x, y, axis_array[FIRST_X_AXIS].label.text,
-			JUST_CENTRE, JUST_TOP, 0,
+			CENTRE, JUST_TOP, 0,
 			axis_array[FIRST_X_AXIS].label.font);
 	reset_textcolor(&(axis_array[FIRST_X_AXIS].label.textcolor), t);
 	ignore_enhanced(FALSE);
--- src/plot2d.c.orig
+++ src/plot2d.c
@@ -2120,7 +2120,7 @@ eval_plots()
 
 		    if (this_plot->labels == NULL) {
 			this_plot->labels = new_text_label(-1);
-			this_plot->labels->pos = JUST_CENTRE;
+			this_plot->labels->pos = CENTRE;
 			this_plot->labels->layer = LAYER_PLOTLABELS;
 		    }
 		    parse_label_options(this_plot->labels);
@@ -2309,7 +2309,7 @@ eval_plots()
 	    if (this_plot->plot_style == LABELPOINTS) {
 		if (this_plot->labels == NULL) {
 		    this_plot->labels = new_text_label(-1);
-		    this_plot->labels->pos = JUST_CENTRE;
+		    this_plot->labels->pos = CENTRE;
 		    this_plot->labels->layer = LAYER_PLOTLABELS;
 		}
 		this_plot->labels->place.scalex =
--- src/plot3d.c.orig
+++ src/plot3d.c
@@ -1555,7 +1555,7 @@ eval_3dplots()
 		    int stored_token = c_token;
 		    if (this_plot->labels == NULL) {
 			this_plot->labels = new_text_label(-1);
-			this_plot->labels->pos = JUST_CENTRE;
+			this_plot->labels->pos = CENTRE;
 			this_plot->labels->layer = LAYER_PLOTLABELS;
 		    }
 		    parse_label_options(this_plot->labels);
