Java and other misc updates