Fix template oversights