Fix Various Scala/Java Interpolation Related Errors