Another round of java rebuilds