Minor formatting and logging tweaks