Logging -> More tweaks