Build: Fixes on logic/template separation.