Fixed serialization issues

Change-Id: I5dc1f2dc061c4b6bb6d00040b972802df97d3f89