More template fixes for keys