DEBUG preprocessor fixes