[Misc] Improve logging slightly