Fix SystemSettings and DisplaySettings