Re-indent, minor serialization fixes