Updated to new AAE code, fixed some crdt related things.