Preprocessor fixes.