Small cleanups and fix when no config is provided.