Fix some Java 7 dependencies