Fix form templates errors