Final tweaks for logging