Fix string quoting so variables interpolate properly