Small freemarker fixes

This fixes #75