Updates to fix nbs config.