Logging-only tweaks