Fix Settings and Base