Some more loggin improvements.