[JNRPE-2, JNRPE-3] fixed issues