Slightly improved logging