Added back some core settings