Changes to the preprocessor