Java Updates and Fixes