Update serialization version to v1.16.
Fix errors introduced in previous commit.
Merge branch 'tim/update-version' into next