Fix Java 7 IDE migration warnings