More fixes on string interpolation