[WIP] Tweak logging