Tweaks to serialization

Change-Id: I861593e314ea1e0737312e42e90f85309bbecec7
Work to get BTree working for experiments

Change-Id: I9c6ef214acee83d5142846f765d5f5aa4846722e