Update for NB 4.0

Some updates to match new NB version.