Minor changes for Windows and new versions of Scala and libraries.