fix Log Macro
fix static analysis warnings