Improve some logging