Branding fixes
[core] Some logging improvement