Fix config unit and improve log
3 files changed