few fixes in preprocessor