Minor templates fixes: closes #95, closes #96, closes #99.