Fixing some problems with string interpolation.