Several changes to fix issues discovered by tests against original java version