diff --git a/Makefile b/Makefile
index 00b30357a..ad4e68bd0 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ test:
 			echo -n "."; \
 		done; \
 	else \
-		echo "WARNING: skipping bashism test - you need to install devscripts."; \
+		echo "WARNING: Skipping bashism test - you need to install devscripts."; \
 	fi
 
 	@echo " done."
diff --git a/frontend/lb b/frontend/lb
index 6a593a65d..2bedb9d12 100755
--- a/frontend/lb
+++ b/frontend/lb
@@ -50,7 +50,7 @@ case "${1}" in
 			# Checking user account
 			if [ "$(id -u)" -ne "0" ]
 			then
-				Echo_error "need root privileges"
+				Echo_error "Root privileges needed!"
 				exit 1
 			fi
 		fi
@@ -80,7 +80,7 @@ case "${1}" in
 			# User has live-build commands in path
 			SCRIPT="${COMMAND}"
 		else
-			Echo_error "no such script: ${COMMAND}"
+			Echo_error "No such script: ${COMMAND}"
 			exit 1
 		fi
 
diff --git a/functions/stagefile.sh b/functions/stagefile.sh
index c1be52c0d..101bd5210 100755
--- a/functions/stagefile.sh
+++ b/functions/stagefile.sh
@@ -18,12 +18,12 @@ Check_stagefile ()
 	then
 		if [ "${_FORCE}" != "true" ]
 		then
-			# Skipping execution
-			Echo_warning "skipping %s, already done" "${NAME}"
+			# Skip execution
+			Echo_warning "Skipping %s, already done" "${NAME}"
 			exit 0
 		else
-			# Forcing execution
-			Echo_message "forcing %s" "${NAME}"
+			# Force execution
+			Echo_message "Forcing %s" "${NAME}"
 			rm -f "${FILE}"
 		fi
 	fi
diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest
index 7c9864e65..2df918763 100755
--- a/scripts/build/binary_memtest
+++ b/scripts/build/binary_memtest
@@ -45,7 +45,7 @@ Create_lockfile .lock
 
 if [ "${LB_ARCHITECTURES}" != "amd64" ] && [ "${LB_ARCHITECTURES}" != "i386" ]
 then
-	Echo_warning "skipping binary_memtest, foreign architecture."
+	Echo_warning "Skipping binary_memtest, foreign architecture."
 	exit 0
 fi
 
diff --git a/scripts/build/config b/scripts/build/config
index dea361809..d1978a461 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -818,7 +818,7 @@ Local_arguments ()
 				;;
 
 			*)
-				Echo_error "internal error %s" "${0}"
+				Echo_error "Internal error %s" "${0}"
 				exit 1
 				;;
 		esac