More work on settings and Core.