More on logging improvements