Logging improvements, part I