More dependency tweaks to get stuff running on Java 8