Some changes in logging, etc