Build improvements.
Template corrections.