Fix issues with preprocessor error messages