Began to fix Scala compilation.