NN and LaunchJar fixes