Small changes; Java interop working