Improve logging
Ouf