Round 2 of update to java7