Fixed generics. Hopefully OpenJDK builds now