Some checks and corrections for java node