various tonal template fixes for merge