Netjack2 code fixes.