Begin fixing up the java side to match the C++ side.