Start fixing splash damage from string replacement