Final settings changes