Further logging improvements