Fixed preprocessor definition problems