Fix Java 1.7 errors [2/2]