Fixes for Java8 build

The launcher is still broken though.