[haida template] minor fixes
Merge pull request #141 from michalbe/flatfish-template-temp

[haida template] minor fixes