Small freemarker fixes