Continued bootstrap
Fixed macro error messages