Fixes for Java8 build on windows.

The launcher is still broken though.