Several fixes for template engine, JavaScripts, etc.