Bug fixes in preprocessor.