Fixed macro error messages