diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt
index 4b71c5bd..18e47b48 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt
@@ -22,7 +22,7 @@ import net.pokeranalytics.android.util.extensions.mediumDate
 import java.util.*
 import kotlin.collections.ArrayList
 
-open class Player : RealmObject(), NameManageable, Deletable, StaticRowRepresentableDataSource, RowRepresentable {
+open class Player : RealmObject(), NameManageable, Savable, Deletable, StaticRowRepresentableDataSource, RowRepresentable {
 
     @PrimaryKey
     override var id = UUID.randomUUID().toString()
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt
index 5f44574a..1ec77784 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt
@@ -466,10 +466,13 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate {
 	 * Create a new hand history
 	 */
 	private fun createNewHandHistory() {
+
 		// gets the first session of the adapter - the last created - to preconfigure the HH
-		this.sessionAdapter.sessionForPosition(0)?.let { session ->
-			HandHistoryActivity.newInstance(this, session, false)
-		} ?: run {
+		if (this.sessionAdapter.itemCount > 0) {
+			this.sessionAdapter.sessionForPosition(0)?.let { session ->
+				HandHistoryActivity.newInstance(this, session, false)
+			} ?: throw PAIllegalStateException("Cannot happen")
+		} else {
 			HandHistoryActivity.newInstance(this)
 		}
 	}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListFragment.kt
index d3e5acd3..32e58eb3 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListFragment.kt
@@ -169,7 +169,7 @@ open class DataListFragment : DeletableItemFragment(), RowRepresentableDelegate
 			RequestCode.NEW_DATA.value -> {
 				if (this.model.isSelectionInstance) {
 
-					data?.getStringExtra(BundleKey.PRIMARY_KEY.value)?.let { id ->
+					data?.getStringExtra(EditableDataActivity.IntentKey.PRIMARY_KEY.keyName)?.let { id ->
 						finishActivityWithSelection(id)
 					} ?: throw PAIllegalStateException("identifier not found")
 
@@ -190,10 +190,6 @@ open class DataListFragment : DeletableItemFragment(), RowRepresentableDelegate
 		if (this.model.isSelectionInstance) { // Ends the activity and go back to previous screen
 			val identifier = (row as Identifiable).id
 			finishActivityWithSelection(identifier)
-//			val intent = Intent()
-//			intent.putExtra(BundleKey.PRIMARY_KEY.value, identifier)
-//			this.activity?.setResult(Activity.RESULT_OK, intent)
-//			this.activity?.finish()
 		} else {
 
 			when (this.model.dataType) {