Fixes on logging