Fixed issues to make NBs runnable.