more lazy logging cleanup fixes