Changes to support auto-loading a dataset on startup again (best for
development).