Add debugging in failure cases
More serialization machinery