Latest (final) fixes for JNAP