Small logging improvements