A bit more fixes in logging