Java port Updates & Opts
Minor opts in C