Fix tonal issues