[haida template] minor fixes