Build improvements.
Logging