Minor changes to preprocessor