Fixes to preprocessor