Fix some onSaveInstanceState.