Fixes in parsing ntl load and codebase