Fixes in logging