Improved logging in slightly.