Small changes in logging