3673: Fix logging