Logging macros fix