Minor log refactorings