few bug fixes NLJ