Improve log and make sure timezone
2 files changed