Fix broken templates