Tweak logging in handlers