Fixed preprocessor macros